Ticket #9343: pari_spkg.patch

.hgignore

@@ -1 +1 @@
 src/
+patches/files

SPKG.txt

@@ -21 +21 @@
 GPL
 
 == SPKG Maintainers ==
+ * Robert Bradshaw
  * Craig Citro
  * William Stein
  * David Kirkby
+ * Jeroen Demeyer
 
 == Upstream Contact ==
  * Karim Belabas, http://www.math.u-bordeaux.fr/~belabas/
  * pari-dev@list.cr.yp.to
 
 == Dependencies ==
- * gmp
+ * MPIR (in place of GMP)
+ * Readline
+ * Termcap
 
 == Build Notes ==
 
-Here is how to build a new version of the PARI SAGE spkg:
+Most of the building of a new version of the PARI spkg is automated
+in the script spkg-make.  Normally, the following should work.  In case
+of doubt, have a look at the file spkg-make.
 
-  1) Get the latest stable source code from
-           http://pari.math.u-bordeaux.fr/download.html
-     (NOTE -- just like last time, at some point the devel version will be
-              the way to go, since that's where all the bug fixes are.
-        The PARI stable/devel model is complicated.)
+  0) Edit the line "svn update -r 12577" in spkg-make and set the
+     desired SVN version.
 
-  2) Extract the above code and make it the directory src in the
-     current directory.
+  1) ./spkg-make
+     This will download the SVN sources to the directory parisvn/
+     and will also download galdata.tgz and ellsea-small.tgz.
+     Then, a src/ directory will be created and the patches in
+     patches/*.patch will be applied (with the patched files stored
+     in patches/files).
+     WARNING: This script will remove any existing src/ and
+     patches/files/ directories.
+     NOTES: The script ./spkg-make will actually compile PARI/GP, but
+     the compiled files are not used for the spkg.  We only need a few
+     files, in particular those created by bison.
+     Running spkg-make should be done on a reasonably standard machine
+     on which PARI/GP compiles out of the box.
 
-  3) Type ./spkg-dist in the above directory.
+  2) Check that everything is okay somehow.  In particular, look at
+     patches/README.txt
 
-  4) Extract the file galdata.tgz from
-     http://pari.math.u-bordeaux.fr/download.html
-     in the directory pari-*/src/
+  3) rm -rf parisvn
+     The directory parisvn is a temporary SVN copy of the PARI sources.
+     When making this package just for testing, you can keep the parisvn
+     directory.  However, it should not be there in a final version.
+
+  4) cd ..; sage -pkg pari-version-name
 
 Note from David Kirkby that could be relevant to building on Solaris:
 
@@ -65 +83 @@
 
 == Changelog ==
 
-=== pari-2.3.5.p1 (Mike Hansen, May 25th 2010) ===
+=== pari-2.4.3.svn-12577.p4 (Jeroen Demeyer, August 22, 2010) ===
+ * Change "test -e" to "test -f" for Solaris.
+ * Configure using "#!/usr/bin/env bash" instead of "#!/bin/sh"
+
+=== pari-2.4.3.svn-12577.p3 (Jeroen Demeyer, August 21, 2010) ===
+ * Cosmetic changes
+
+=== pari-2.4.3.svn-12577.p2 (Jeroen Demeyer, August 17, 2010) ===
+ * Patch get_dlcflags on Darwin
+
+=== pari-2.4.3.svn-12577 (Jeroen Demeyer, August 5, 2010) ===
+
+=== pari-2.4.3.svn-12546 (Jeroen Demeyer, July 25, 2010) ===
+ * Removed the non-existent get_dlld patching.
+ * Cleaned up patches/README.txt 
+
+=== pari-2.4.3.svn.p7 (Jeroen Demeyer, July 23, 2010) ===
+ * pari 2.4.3 version svn 12543
+ * Remove patches for get_cc, get_dlcflags, get_kernel, get_dlld
+
+=== pari-2.4.3.svn.p6 (Jeroen Demeyer, July 22, 2010) ===
+ * pari 2.4.3 version svn 12541
+ * Added spkg-make script to automate building of this spkg
+ * Changed patch logic in spkg-install
+ * Add patches for PARI bug 1079
+
+=== pari-2.4.3.svn.p5 (John Cremona July 13, 2010) ===
+ * pari 2.4.3 version svn 12541
+ * adds spkg-check by David Kirkby
+
+=== pari-2.4.3.svn.p1, p2, p3, p4 (Robert Bradshaw and William Stein,
+June 26, 2010; John Cremona July 13, 2010) ===
+ * Major new version
+ * p4 contains pari 2.4.3 version svn 12534
+
+=== pari-2.3.5.p1 (Mike Hansen, May 25th, 2010) ===
  * Do the same fix for Cygwin that we do on Solaris.
 
 === pari-2.3.5.p0 (Georg S. Weber, May 2nd, 2010 ===

new file patches/1079_part1.patch

@@ +1 @@
+--- src/basemath/base2.c
++++ src/basemath/base2.c
+@@ -3344,10 +3344,7 @@ polcompositum0(GEN A, GEN B, long flall)
+     for (i=1; i<l; i++)
+     { /* invmod possibly very costly */
+       GEN D = gel(C,i), invH1 = QXQ_inv(H1, D);
+-      if (typ(H0) == t_POL)
+-        a = RgXQ_mul(RgX_neg(H0), invH1, D);
+-      else /* scalar */
+-        a = RgX_Rg_mul(invH1, gneg(H0));
++      a = RgXQ_mul(RgX_neg(H0), invH1, D);
+       b = gadd(pol_x(v), gmulsg(k,a));
+       gel(C,i) = mkvec4(D, mkpolmod(a,D), mkpolmod(b,D), stoi(-k));
+     }

new file patches/1079_part2.patch

@@ +1 @@
+--- src/basemath/polarit3.c
++++ src/basemath/polarit3.c
+@@ -2536,6 +2536,8 @@ END:
+   if (plambda) *plambda = lambda;
+   if (LERS)
+   {
++    if (typ(H0)==t_INT) H0 = scalarpol(H0,vY);
++    if (typ(H1)==t_INT) H1 = scalarpol(H1,vY);
+     *LERS = mkvec2(H0,H1);
+     gerepileall(av, 2, &H, LERS);
+     return H;

new file patches/Configure.patch

@@ +1 @@
+Index: Configure
+===================================================================
+--- Configure   (revision 12583)
++++ Configure   (working copy)
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!/usr/bin/env bash
+ #
+ # This file is part of the PARI/GP package.
+ #

new file patches/Makefile.SH.patch

@@ +1 @@
+Index: config/Makefile.SH
+===================================================================
+--- config/Makefile.SH  (revision 12583)
++++ config/Makefile.SH  (working copy)
+@@ -599,9 +599,9 @@
+ EOT
+ fi
+ 
+-if test -e $TOP/.svn/entries; then
++if test -f "$TOP/.svn/entries"; then
+   vcfile="../.svn/entries"
+-else if test -e $TOP/.git/index; then
++else if test -f "$TOP/.git/index"; then
+   vcfile="../.git/index"
+   fi
+ fi

new file patches/README.txt

@@ +1 @@
+Details of which source files are patched in spkg-install, and why.
+See below for information on files which used to be patched but are no
+longer (do not delete that!)
+
+======================================================================
+Files patched as of pari-2.4.3.svn-12577.p4:
+======================================================================
+
+Configuration files:
+* Configure: use "#!/usr/bin/env bash" instead of "#!/bin/sh"
+* config/get_ld: cwitty: disable -rpath
+* config/get_tests: John Cremona: disable testing of ellglobalred in
+                    "make test-all" in spkg-check, since it requires
+                    the elldata database which we do not include.
+* config/get_dlcflags: Add -fno-common to DLCFLAGS on Darwin.
+* config/Makefile.SH: Change "test -e" to "test -f" for Solaris.
+
+Documentation:
+* doc/gphelp.in: cwitty: disable TeX; allow bz2 compression
+
+Header files: 
+* src/headers/paripriv.h: *after* building, on {OS X, SunOS, SYGWIN},
+                          rename "ECHO"
+
+C files:
+* src/kernel/gmp/mp.c: needed so that Sage can catch pari's error signals.  
+* src/language/init.c: needed so that Sage can catch pari's error signals.  
+* src/basemath/base2.c and src/basemath/polarit3.c: fix PARI bug 1079.
+
+======================================================================
+Files previously patched:
+======================================================================
+
+* config/get_cc: on SunOS only, add "-fPIC" to compiler flags (David Kirkby)
+  This happens not with a patch file, but with a sed command in
+  spkg-install.  Now fixed upstream (-fPIC added on all platforms).
+
+*config/get_dlcflags: mabshoff: To get around problem in PPC 32-bit
+  Linux build.  Now fixed upstream (-fPIC added on all platforms).
+
+* config/get_kernel: pjeremy: fix for FreeBSD: #7825.  Supposedly fixed
+  upstream.
+
+* config/get_dlld: Undocumented patch for Darwin.  Removed to see what
+  happens...
+ 
+
+* config/get_cc: changed OPTFLAG from "-O3" to "-O1" on Linux because of
+problems on Fedora 11 (32-bit) with one gcc version (ticket #7092).
+
+# Minh Van Nguyen: copy over patched get_cc (see ticket #7092). It's
+# reported that 32-bit Fedora 11 would fail to build otherwise.
+if [ `uname` = "Linux" ]; then
+    cp "$TOP"/patches/get_cc config/get_cc
+fi
+
+* src/headers/paridecl.h: used to need a dummy variable changed from B0
+  to N; now fixed upstream.
+* src/headers/paripriv.h: used to need a dummy variable changed from B0
+  to N; now fixed upstream.  NB There's another patch on this file still
+  in place!
+

deleted file patches/get_cc

@@ -1 @@
-# Exported variables
-_cc_list="__gnuc__ CC CFLAGS optimization DBGFLAGS OPTFLAGS exe_suff suffix ASMINLINE"
-
-# Which optimization ?
-if test "$fastread" != yes; then
-  cat << EOT
-==========================================================================
-The default is to fully optimize the compilation. You may choose to build
-  an executable for debugging or profiling instead. Choose among :
-       full       debugging       profiling
-EOT
-  echo $n ..."Which optimization do you prefer ? $c"
-  dflt=$optimization; rep='full debugging profiling'; . ./myread
-  optimization=$ans
-fi
-
-case "$osname" in
-  os2)   exe_suff=.exe; extraflag="-Zexe";;
-  cygwin|mingw) exe_suff=.exe; extraflag="";;
-# On Darwin, by default, the full library search path is searched for a .dylib
-# before a .a can be considered, preventing users to install their libraries
-# in a simple way (e.g. the readline / Editline conflict). Override this.
-  darwin)  exe_suff=;     extraflag=-Wl,-search_paths_first;;
-  *)       exe_suff=;     extraflag="";;
-esac
-
-if test -z "$CC"; then
-  echo Looking for the compilers ...
-  # Native Compilers
-  cc=`./locate cc '' $pathspace`
-  case "$osname" in
-    hpux) if test "$cc" = /usr/ccs/bin/cc -a -f /opt/ansic/bin/cc; then
-            cc=/opt/ansic/bin/cc; fi ;;  # This is a better compiler
-  esac
-  case "$cc" in ?:/*|/*) echo ..."cc is $cc";;
-      *) echo ..."I could not find cc.";; esac
-  # GNU Compilers
-  gcc=`./locate gcc '' $pathspace`
-  if test -z "$gcc"; then
-    exe=$osname-$arch-gnu$$
-    $cc $extraflag -o $exe gnu.c
-    if $RUNTEST $exe; then gcc=$cc; fi; rm -f $exe
-  fi
-  case "$gcc" in
-?:/*|/*) echo ..."gcc is $gcc";;
-      *) echo ..."I could not find gcc."; gcc=;;
-  esac
-  if test -n "$gcc"; then
-    # avoid internationalization trouble by setting LANG=C
-    __gnuc__=`env LANG=C LC_ALL=C LC_MESSAGES=C $gcc -v 2>&1 | sed -n 's/.*version //p'`
-    if test -z "$__gnuc__"; then __gnuc__=unknown; fi
-    echo GNU compiler version $__gnuc__
-  fi
-  case "$osname" in
-    aix)   __gnuc__=;; # Native compilers are faster
-    hpux)  __gnuc__=;; # versions older than 2.7 cannot build PIC code
-                       # gp built with recent versions has bugs
-    concentrix) case "$__gnuc__" in 2.[78].*);; *)
-              __gnuc__=;; esac;;
-  esac
-  # Choosing the compiler
-  if test -n "$__gnuc__"; then CC=$gcc; else CC=$cc; fi
-fi
-
-if test "$fastread" != yes; then
-  cat << EOT
-==========================================================================
-Only ANSI C and C++ compilers are supported.  Choosing the GNU compiler
-gcc/g++ enables the inlining of kernel routines (about 20% speedup; if you
-use g++, it is a good idea to include the -fpermissive flag).  If you choose
-not to use gcc, the C++ version of Pari will be a little faster because of
-general inlining, but can be used in library mode only with C++ programs.
-We strongly recommand using gcc all the way through.
-EOT
-  echo $n ..."Which C compiler shall I use ? $c"
-  dflt=$CC; rep=; . ./myread
-  CC=$ans
-fi
-
-exe=$osname-$arch-ansi$$
-$CC $CFLAGS $extraflag -o $exe ansi.c 2>/dev/null && $RUNTEST $exe
-if test $? != 0; then cat << EOT
-###
-### C compiler does not work. PARI/GP requires an ANSI C compiler! Aborting.
-###
-### Compiler was: $CC $CFLAGS $extraflag
-EOT
-  exit 1;
-fi
-rm -f $exe $exe$exe_suff
-
-if test "$CC" != "$gcc"; then __gnuc__=; fi
-if test -z "$__gnuc__"; then
-  exe=$osname-$arch-gnu$$
-  $CC $extraflag -o $exe gnu.c
-  if $RUNTEST $exe; then
-    # avoid internationalization trouble by setting LANG=C
-    __gnuc__=`env LANG=C LC_ALL=C LC_MESSAGES=C $CC -v 2>&1 | sed -n 's/.*version //p'`
-    echo GNU compiler version $__gnuc__
-  fi
-  rm -f $exe $exe$exe_suff
-fi
-
-# Which Flags for Compiler ?
-#
-cflags=
-ASMINLINE=
-if test -n "$__gnuc__"; then
-  __GNUC__="-D__GNUC__"
-  warn="-Wall"
-  # Work around for building on 32-bit Fedora 11. See ticket #7092.
-  OPTFLAGS=-O1
-  ASMINLINE=yes
-  case "$asmarch" in
-    alpha)
-      case "$__gnuc__" in
-        2.95.[3-9]*|[3-9].*) ;;
-        *) ASMINLINE=;; # doesn't work with 2.95.2.
-      esac
-    ;;
-  esac
-  OPTFLAGS="$OPTFLAGS $warn"
-  case "$__gnuc__" in
-    2.95.[3-9]*|[3-9].*) OPTFLAGS="$OPTFLAGS -fno-strict-aliasing";;
-  esac
-  KERNELCFLAGS=-funroll-loops
-
-  DBGFLAGS=${DBGFLAGS:-"-g $warn"}
-  # Specific optimisations for some architectures
-  case "$arch" in
-    sparcv8*) cflags=-mv8;;
-    i?86|x86_64)
-      case "$__gnuc__" in
-        4.0.*) cflags=-fno-gcse-after-reload
-      esac
-  esac
-  # problems on some architectures
-  case "$osname" in
-    os2)      cflags="$cflags -Zmt -Zsysv-signals";;
-    nextstep) cflags="$cflags -traditional-cpp";;
-    darwin) # don't use broken pre-compiled headers on old Darwin
-      if ($CC -no-cpp-precomp ansi.c 2>/dev/null); then :
-      else
-        cflags="$cflags -no-cpp-precomp"
-      fi;;
-  esac
-
-  # omit-frame-pointer incompatible with -pg
-  PRFFLAGS="-pg $OPTFLAGS"
-  case "$optimization" in
-    full) case "$osname" in
-           mingw) ;;
-           *) OPTFLAGS="$OPTFLAGS -fomit-frame-pointer";;
-          esac;;
-  esac
-else
-  DBGFLAGS=${DBGFLAGS:-'-g'}
-  PRFFLAGS='-pg'
-  case "$osname-$arch" in
-    hpux-*) # -Ae is for ANSI C + defines HPUX_SOURCE
-                  OPTFLAGS=-O; cflags=-Ae;;
-    aix-*)        OPTFLAGS='-O2 -qtune=auto -qmaxmem=8192'
-                  cflags='-qlanglvl=ansi';;
-    osf1-*)       OPTFLAGS='-O4 -migrate -ifo -Olimit 9999';;
-    sunos-*)      OPTFLAGS=-fast; PRFFLAGS='-pg -Bstatic';;
-    solaris-*)    OPTFLAGS='-fast -fsimple=1'; PRFFLAGS=-xpg;
-                case "$arch" in
-                  sparc*) OPTFLAGS="$OPTFLAGS -xalias_level=any";;
-                esac;;
-    concentrix-*) OPTFLAGS=-Ogi;;
-    *)            OPTFLAGS=-O;;
-  esac
-  PRFFLAGS="$PRFFLAGS $OPTFLAGS"
-fi
-
-case "$optimization" in
-  full)      suffix=;     cflags="$OPTFLAGS $cflags";;
-  profiling) suffix=.prf; cflags="$PRFFLAGS $cflags";;
-  debugging) suffix=.dbg; cflags="-DMEMSTEP=1048576 $DBGFLAGS $cflags";;
-esac
-
-CFLAGS="$cflags $CFLAGS $CPPFLAGS"
-if test "$fastread" != yes; then
-  echo $n ..."With which flags ? $c"
-  dflt=$CFLAGS; rep=; . ./myread
-  CFLAGS=$ans
-fi

deleted file patches/get_cc.patch

@@ -1 @@
---- ../src/config/get_cc        2007-03-10 07:57:08.000000000 -0800
-+++ get_cc      2009-10-03 02:18:29.000000000 -0700
-@@ -106,7 +106,8 @@
- if test -n "$__gnuc__"; then
-   __GNUC__="-D__GNUC__"
-   warn="-Wall"
--  OPTFLAGS=-O3
-+  # Work around for building on 32-bit Fedora 11. See ticket #7092.
-+  OPTFLAGS=-O1
-   ASMINLINE=yes
-   case "$asmarch" in
-     alpha)

deleted file patches/get_dlcflags

@@ -1 @@
-_dl_list="DLCFLAGS"
-if test -n "$__gnuc__"; then
-  # Some architectures need -fPIC for building dynamic lib
-  # *-i?86|*-sparc*|*-powerpc|*-s390|*-mips) DLCFLAGS=
-  case "$osname-$arch" in
-    *-hppa|*-ia64|*-alpha|*-arm|*-m68k|*linux-ppc) DLCFLAGS=-fPIC ;;
-    *-x86_64|*-sparc*|*-amd64) case "$sizeof_long" in
-              8) DLCFLAGS=-fPIC;;
-              esac;;
-    darwin-*) DLCFLAGS=-fno-common;;
-  esac
-else
-  case "$osname-$arch" in
-    hpux-*) DLCFLAGS=+z;;
-    solaris-sparc*) case "$sizeof_long" in
-              8) DLCFLAGS=-KPIC;; # assume sun cc
-              esac;;
-  esac
-fi
-
-echo "C compiler is          $CC $CFLAGS $DLCFLAGS"

patches/get_dlcflags.patch

@@ -1 @@
---- ../src/config/get_dlcflags  2006-05-15 00:04:51.000000000 -0700
-+++ get_dlcflags        2010-01-03 23:06:39.000000000 -0800
-@@ -3,8 +3,8 @@
-   # Some architectures need -fPIC for building dynamic lib
-   # *-i?86|*-sparc*|*-powerpc|*-s390|*-mips) DLCFLAGS=
-   case "$osname-$arch" in
--    *-hppa|*-ia64|*-alpha|*-arm|*-m68k) DLCFLAGS=-fPIC ;;
--    *-x86_64|*-sparc*) case "$sizeof_long" in 
-+    *-hppa|*-ia64|*-alpha|*-arm|*-m68k|*linux-ppc) DLCFLAGS=-fPIC ;;
-+    *-x86_64|*-sparc*|*-amd64) case "$sizeof_long" in 
-               8) DLCFLAGS=-fPIC;;
-               esac;;
-     darwin-*) DLCFLAGS=-fno-common;;
+--- config/get_dlcflags 2010-08-05 22:32:03.000000000 +0200
++++ config/get_dlcflags 2010-08-17 17:10:20.000000000 +0200
+@@ -2,6 +2,7 @@
+ if test -n "$__gnuc__"; then
+   case $osname in
+     cygwin|mingw) DLCFLAGS=;;
++    darwin) DLCFLAGS="-fPIC -fno-common";;
+     *) DLCFLAGS=-fPIC;;
+   esac
+ else #assume native compiler

deleted file patches/get_dlld

@@ -1 @@
-# Exported variables
-_dlld_list='DL_DFLT_NAME DLLD DLLDFLAGS EXTRADLLDFLAGS DLSUFFIX soname sodest'
-
-# Which suffix for Dynamic Lib?
-# Some linkers (SunOS 4) need minor and major lib version numbers.
-# Some others (SunOS 5) need a link from a .so
-# Some others (HPUX 09) do not want version numbers.
-DLSUFFIX=so
-soname=.$soname_num
-do_dll=yes
-case "$osname" in
-  gnu*|aix|osf1|solaris|linux|freebsd|netbsd)
-    case $pari_release_verbose in
-      *STABLE*)      sodest=.$version.$patch;; # released version
-      *DEVELOPMENT*) sodest=.$patch.0.0;;      # unstable version
-    esac ;;
-  sunos) sodest=.$VersionMajor$VersionMinor.$patch
-         soname=$sodest;;
-  hpux) soname= ; sodest= ; DLSUFFIX=sl;;
-  irix) soname= ; sodest= ;;
-  os2|cygwin|mingw)soname= ; sodest= ; DLSUFFIX=dll ;;
-  darwin)soname= ; sodest= ; DLSUFFIX=dylib;;
-  *) do_dll=no ;;
-esac
-
-# dlopen(NULL) should return a handle to the running process.
-# On FreeBSD 2.2.5 (Y. Uchikawa) and Cygwin, this does not work.
-case "$osname" in
-  freebsd|cygwin) DL_DFLT_NAME="\\\"\$(LIBPARI_DYN)\\\"" ;;
-  mingw) DL_DFLT_NAME="\\\"\$(LIBPARI_SO)\\\"" ;;
-  *) DL_DFLT_NAME=NULL ;;
-esac
-
-# if DLLD is defined at this point, respect it, even if do_dll=no
-if test $do_dll = yes -a -z "$DLLD"; then
-  if test -n "$__gnuc__" -o "$osname" = "solaris"; then
-    DLLD="$CC"
-  else
-    DLLD=$ld # don't take risks
-  fi
-fi
-
-GNUdlld=
-DLLDisGCC=
-if test -n "$DLLD"; then
-# Which Dynamic Lib Linker?
-  if test "$fastread" != yes; then
-    echo $n ..."Which linker for building dynamic libs? $c"
-    dflt="$DLLD"; rep=; . ./myread
-    DLLD=$ans
-  fi
-
-  if test "$DLLD" = "$CC" -a -n "$__gnuc__"; then
-    DLLDisGCC=yes;
-    GNUdlld=$GNULDused
-  else
-    case "$DLLD" in
-      *ld) if ($DLLD -v 2>&1 | grep GNU > /dev/null); then GNUdlld=yes; fi;;
-    esac
-  fi
-
-# Which Flags for Dynamic Lib Linker ?
-  dlldflags="$DLLDFLAGS"
-  DLLDFLAGS=
-  if test -n "$GNUdlld"; then
-    DLLDFLAGS="-shared -soname=\$(LIBPARI_SONAME)"
-  else # DLLD != GNU ld
-    case "$osname" in
-      aix)     DLLDFLAGS='-r' ;;
-      darwin)  DLLD=gcc; DLLDFLAGS='-flat_namespace -undefined suppress' ;;
-      freebsd) DLLDFLAGS='-Bshareable -x' ;;
-      hpux)    DLLDFLAGS='-b' ;;
-      irix)    DLLDFLAGS='-shared -elf -no_unresolved -all' ;;
-      osf1)    DLLDFLAGS='-shared' ;;
-      solaris) DLLDFLAGS="-G -h \$(LIBPARI_SONAME)" ;;
-      sunos)   DLLDFLAGS='-assert nodefinitions' ;;
-      os2)     ;; # see below
-      linux)   ;; # for e.g. the Portland Group cc (pgcc)
-      *)         DLLD=;;
-    esac
-  fi
-  if test -n "$DLLDFLAGS"; then
-    DLLDFLAGS=`./ldflags "$DLLDisGCC" $DLLDFLAGS`
-  fi
-  case "$osname" in
-    os2) DLLDFLAGS="$CFLAGS -Zdll" ;; # assume DLLD = gcc
-    cygwin) DLLDFLAGS="-Wl,--out-implib=\$(LIBPARI_SO)\$(_A),--export-all-symbols";;
-    mingw) DLLDFLAGS="-Wl,--out-implib=\$(LIBPARI_SO)\$(_A)";;
-  esac
-  if test -n "$DLLDisGCC"; then
-    case "$arch" in
-      sparc*) extra='-mimpure-text';;
-      *) extra=;;
-    esac
-    case "$osname" in
-      darwin) shared=-dynamiclib;;
-      *) shared=-shared;;
-    esac
-    DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
-    fi
-  fi
-  case "$osname" in
-# Beware: will run through 'eval' [ hence ${...} instead of \$(...) ]
-    gnu*|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
-  esac
-
-  if test "$fastread" != yes; then
-    echo $n ..."Which flags for linker? $c"
-    dflt=$DLLDFLAGS; rep=; . ./myread
-    DLLDFLAGS=$ans
-  fi
-  DLLDFLAGS="$DLLDFLAGS $dlldflags"
-fi
-
-if test -z "$DLLD"; then
-  echo "No Dynamic Lib"
-else
-  echo "Dynamic Lib linker is  $DLLD  $DLLDFLAGS"
-fi

deleted file patches/get_dlld.patch

@@ -1 @@
---- ../src/config/get_dlld      2009-09-19 05:01:14.000000000 -0700
-+++ get_dlld    2010-03-05 20:36:54.000000000 -0800
-@@ -65,7 +65,7 @@
-   else # DLLD != GNU ld
-     case "$osname" in
-       aix)     DLLDFLAGS='-r' ;;
--      darwin)  DLLD=; DLLDFLAGS='-dylib -flat_namespace -undefined suppress' ;;
-+      darwin)  DLLD=gcc; DLLDFLAGS='-flat_namespace -undefined suppress' ;;
-       freebsd) DLLDFLAGS='-Bshareable -x' ;;
-       hpux)    DLLDFLAGS='-b' ;;
-       irix)    DLLDFLAGS='-shared -elf -no_unresolved -all' ;;
-@@ -88,10 +88,14 @@
-       sparc*) extra='-mimpure-text';;
-       *) extra=;;
-     esac
--    DLLDFLAGS="-shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
-+    if test "$osname" = darwin; then
-+        DLLDFLAGS="-dynamiclib $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
-+    else
-+        DLLDFLAGS="-shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
-+    fi
-   fi
-   case "$osname" in
--    gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
-+    gnu*|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
-   esac
- 
-   if test "$fastread" != yes; then

deleted file patches/get_kernel

@@ -1 @@
-# Testing Architectures. Try uname to provide a default, then ask user.
-#
-case "$arch" in
-  sparc)         asmarch=sparcv8_micro; prettya=Sparc ;;
-  sparcv8_micro) asmarch=$arch;         prettya=MicroSparc ;;
-  sparcv8_super) asmarch=$arch;         prettya=SuperSparc ;;
-  sparcv9) case "$sizeof_long" in
-           4) asmarch=sparcv8_micro;;
-           8) asmarch=none;;
-           esac;                        prettya=UltraSparc ;;
-  i?86)    case "$sizeof_long" in
-           4) asmarch=ix86;;
-           8) asmarch=x86_64;;
-           esac;                        prettya=$arch ;;
-  x86_64|amd64)  case "$sizeof_long" in
-           4) asmarch=ix86;;
-           8) asmarch=x86_64;;
-           esac;                        prettya='amd64';;
-  ia64)    case "$sizeof_long" in
-           4) asmarch=none;;
-           8) asmarch=ia64;;
-           esac;                        prettya=Itanium;;
-  hppa) case "$sizeof_long" in
-           4) asmarch=hppa;             prettya='PA-RISC1.1';;
-           8) asmarch=hppa64;           prettya='PA-RISC2.0';;
-           esac;;
-  alpha)         asmarch=$arch;         prettya=Alpha ;;
-  ppc)  case "$sizeof_long" in
-        4) asmarch=$arch;;
-        8) asmarch=ppc64;;
-        esac;                           prettya='PowerPC' ;;
-  arm*)          asmarch=none;          prettya=$arch ;;
-  mips)          asmarch=none;          prettya=MIPS ;;
-  m68k)          asmarch=m68k;          prettya='Motorola 68k';;
-  sh3)           asmarch=none;          prettya=SH-3 ;;
-  sh5)           asmarch=none;          prettya=SH-5 ;;
-  vax)           asmarch=none;          prettya=VAX ;;
-  fx2800)        asmarch=none;          prettya='Alliant FX/2800' ;;
-  s390)          asmarch=none;          prettya='S/390' ;;
-  none)          asmarch=none;          prettya=unknown ;;
-  *)             asmarch=none;          prettya=$arch
-                 echo "        Warning ! architecture $arch not tested";;
-esac
-
-#
-#   Modifications for pretty name and asm file
-#
-
-tmp_kern=auto-auto
-if test  -n "$kernel"; then
-  tmp_kern=$kernel
-else
-  if test "$fastread" != yes; then
-  cat << EOM
-An optimized Pari kernel is available for these architectures
-("none" means that we will use the portable C version of GP/PARI)
-("-gmp" means we will use the GMP library (that needs to be installed))
-EOM
-  rep='none sparcv8_super sparcv8_micro ix86 alpha hppa m68k ppc ppc64 x86_64
-  none-gmp sparcv8_super-gmp sparcv8_micro-gmp ix86-gmp alpha-gmp hppa-gmp m68k-gmp ppc-gmp ppc64-gmp x86_64-gmp'
-  . ./display
-  echo $n ..."Which of these apply, if any ? $c"
-  dflt=$asmarch; . ./myread;
-  kernel=$ans # explicit kernel, needed when checking for gmp in Configure
-  tmp_kern=$ans
-  cat << EOM
-==========================================================================
-EOM
-  fi
-fi
-if test -z "$without_gmp" ; then
-  lvl1=gmp
-else
-  lvl1=none
-fi
-tmp_kern=`./kernel-name $tmp_kern $asmarch $lvl1`
-kernlvl0=`echo "$tmp_kern" | sed -e 's/\(.*\)-.*/\1/'`
-kernlvl1=`echo "$tmp_kern" | sed -e 's/.*-\(.*\)/\1/'`
-
-case "$kernlvl0" in
-  none)          prettyk0="portable C";;
-  m68k)          prettyk0="m68k";;
-  sparcv8_super) prettyk0=SuperSparc;;
-  sparcv8_micro) prettyk0=MicroSparc;;
-  ix86)          prettyk0=ix86;;
-  ia64)          prettyk0=ia64;;
-  hppa)          prettyk0=HPPA;;
-  hppa64)        prettyk0=HPPA64;;
-  alpha)         prettyk0=Alpha;;
-  ppc)           prettyk0=PPC;;
-  ppc64)         prettyk0=PPC64;;
-  x86_64)        prettyk0="x86-64";;
-  *)             prettyk0="$kernlvl0";;
-esac
-
-. get_pretty
-
-echo "Building for: $pretty"
-cat << EOM
-==========================================================================
-EOM

deleted file patches/get_kernel.patch

@@ -1 @@
---- ../src/config/get_kernel    2007-03-09 15:49:59.000000000 -0800
-+++ get_kernel  2010-01-03 23:07:55.000000000 -0800
-@@ -12,7 +12,7 @@
-            4) asmarch=ix86;;
-            8) asmarch=x86_64;;
-            esac;                        pretty=$arch ;;
--  x86_64)  case "$sizeof_long" in   
-+  x86_64|amd64)  case "$sizeof_long" in   
-            4) asmarch=ix86;;
-            8) asmarch=x86_64;;
-            esac;                        pretty='amd64';;

deleted file patches/get_ld

@@ -1 @@
-# Which Executable Linker ?
-#
-_ld_list='LD LDFLAGS LIBS runpathprexix LDneedsWl LDused GNULDused'
-case "$osname" in
-  darwin) LIBS= ;;
-  osf1)   LIBS='-lm -lots';;
-  *)      LIBS=-lm;;
-esac
-
-if test -z "$LD"; then LD=$CC; fi
-
-if test "$fastread" != yes; then
-  echo $n ..."Which linker for building executables ? $c"
-  dflt=$LD; rep=; . ./myread
-  LD=$ans
-fi
-LDused=$LD
-
-# Which Flags for Executable Linker?
-ldflags=
-GNULDused=
-if test "$LD" = "$CC"; then
-  ldflags=$CFLAGS
-  if test -n "$__gnuc__"; then
-    LDused=`$CC -print-prog-name=ld`
-    LDneedsWl=yes
-  else
-    if test "$osname" = hpux; then LDneedsWl=yes; fi
-  fi
-fi
-if ($LDused -v 2>&1 | grep GNU > /dev/null); then GNULDused=yes; fi
-
-tmp=
-if test "$GNULDused" = "yes"; then
-  case "$osname" in
-    cygwin|mingw) ;; # PE does not support --export-dynamic
-    *) tmp=--export-dynamic ;;
-  esac
-else
-  case "$osname-$arch" in
-    aix-*)  tmp=-brtl ;; # in case we link against a shared library
-    hpux-*) tmp=-E ;;
-  esac
-fi
-case "$osname" in
-  darwin) tmp=$tmp -search_paths_first;;
-esac
-
-if test -n "$tmp"; then
-  tmp=`./ldflags "$LDneedsWl" $tmp`
-  ldflags="$ldflags $tmp"
-fi
-
-case "$osname-$arch" in
-  os2-*)  ldflags="$ldflags -Zexe"
-          if test "$optimization" = "full"; then ldflags="$ldflags -s"; fi
-esac
-
-LDFLAGS="$ldflags $LDFLAGS"
-
-if test "$fastread" != yes; then
-  echo $n ..."With which flags ? $c"
-  dflt=$LDFLAGS; rep=; . ./myread
-  LDFLAGS=$ans
-fi
-
-echo "Executable linker is   $LD  $LDFLAGS"
-
-if test "$GNULDused" = yes; then
-  runpathprefix='-rpath '
-else # guess...
-  case "$osname" in
-    gnu|osf1|linux|cygwin*|freebsd|netbsd) runpathprefix='-rpath ' ;;
-    solaris) runpathprefix='-R ' ;;
-    hpux) runpathprefix='+b ' ;;
-    aix) runpathprefix='-blibpath:' ;;
-  esac
-fi
-# We want Sage directories to be relocatable, so rpath is bad.  Kill it.
-runpathprefix=''

patches/get_ld.patch

@@ -1 @@
---- ../src/config/get_ld        2006-01-24 13:24:26.000000000 -0800
-+++ get_ld      2007-12-26 21:35:54.000000000 -0800
-@@ -64,3 +64,5 @@
+--- config/get_ld       (revision 12541)
++++ config/get_ld       (working copy)
+@@ -76,3 +76,5 @@
      aix) runpathprefix='-blibpath:' ;;
    esac
  fi

new file patches/get_tests.patch

@@ +1 @@
+--- config/get_tests    (revision 12541)
++++ config/get_tests    (working copy)
+@@ -4,7 +4,7 @@
+ _test_list='test_extra_out test_extra test_basic top_test_extra top_dotest_extra'
+ 
+ # _not_ included in 'make test-all' (annoying)
+-test_extra_out="ploth"
++test_extra_out="ploth ellglobalred"
+ 
+ # included in 'make bench'
+ test_basic="\

deleted file patches/gphelp.in

@@ -1 @@
-#!@perl@
-#
-# $Id: gphelp.in 12437 2010-06-18 07:59:23Z kb $
-#
-# Copyright (C) 2000  The PARI group.
-#
-# This file is part of the PARI/GP package.
-#
-# PARI/GP 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. It is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY WHATSOEVER.
-#
-# Check the License for details. You should have received a copy of it, along
-# with the package; see the file 'COPYING'. If not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Output extended help corresponding to a given GP command. By default,
-# extract relevant information from  from the PARI manual, run TeX, then open
-# an xdvi display.
-#
-# The manual can be compressed.
-#
-# Usage: gphelp keyword
-#
-# Command line options:
-#  -k: apropos (list of relevant GP functions)
-#  -detex      (-d): don't use TeX + xdvi (implicit when DISPLAY is not set).
-#  -color_help (-ch) <number>: use color "number" (same scheme as in GP)
-#  -color_bold (-cb) <number>: display bold in color "number"
-#  -color_underline (-cu) <number>: display underlined text in color "number"
-#
-#  -raw   use internal format for output with @x markers, -detex is implicit
-#         (for the TeX-to-pod converter)
-#
-#  -to_pod file         convert file to POD (should be the only args)
-#
-#  -to_dumbpod file     same, but without nested formating
-#
-# Granted environment variables (override):
-#  GPTMPDIR: where temporary files will go (/tmp by default).
-#  GPDOCDIR: where is manual (by default, where make install will put it).
-#  GPXDVI: which 'xdvi' program to call (xdvi by default)
-#
-$version= "@version@";
-$datadir= "@datadir@";
-# no expanded material (@key@) below
-$wwwsite= "http://pari.math.u-bordeaux.fr/";
-
-$xdvi = $ENV{GPXDVI} || "xdvi";
-$xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
-$gzip = "gzip";
-$zcat = "$gzip -dc";
-$bzip = "bzip2";
-$bzcat = "$bzip -dc";
-$docdir = &get_docdir();
-
-$refcard = (@ARGV and $ARGV[-1] =~ /refcard/i);
-
-$dumb_pod=1, $ARGV[0] = '-to_pod' if @ARGV && $ARGV[0] eq '-to_dumb_pod';
-&to_pod() if @ARGV == 2 && $ARGV[0] eq '-to_pod';
-
-&options(); &init();
-if ($#ARGV < 0) { &treat($_); cleanexit(); }
-
-&pretex() if (!$detex);
-for (@ARGV) { &treat($_); }
-if ($apropos) { &apropos_final_print(); cleanexit(); }
-&posttex() if (!$detex);
-print "ugly_kludge_done\n" if (!$detex && $fromgp);
-cleanexit();
-
-#
-# Procedures
-#
-sub cleanexit {
-  print "\e[0m" unless $to_pod;
-  exit 0;
-}
-
-sub help {
-  print "Usage: $0 [-k] [-detex] [-ch c1] [-cb c2] [-cu c3] keyword\n";
-  print "where c1,c2,c3 denote background, bold and underline color\n";
-  exit(1);
-}
-
-sub options {
-  $raw = $detex = $fromgp = $apropos = 0;
-  $ch = $cb = $cu = '';
-  while ($_ = $ARGV[0])
-  {
-    last if (! /^-[a-z]/);
-    shift(@ARGV);
-    if ($_ eq "-fromgp")
-      { $fromgp = 1; }
-    elsif ($_ eq "-k")
-      { $apropos = $detex = 1; }
-    elsif ($_ eq "-balloon")
-      { $balloon = 1; }
-    elsif ($_ eq "-detex" || $_ eq "-d")
-      { $detex = 1; }
-    elsif ($_ eq "-raw")
-      { $raw = $detex = 1; }
-    elsif ($_ eq "-color_help" || $_ eq "-ch")
-      { $ch = &color(shift(@ARGV)); }
-    elsif ($_ eq "-color_bold" || $_ eq "-cb")
-      { $cb = &color(shift(@ARGV)); }
-    elsif ($_ eq "-color_underline" || $_ eq "-cu")
-      { $cu = &color(shift(@ARGV)); }
-    else
-      { &help(); }
-  }
-  $ch = "\e[m$ch";
-  $cu .= $cu ? "\e[1m": "\e[4m";
-  $cb .= "\e[1m";
-  $detex = 1 if (!$ENV{DISPLAY});
-  # Disable TeX for Sage.
-  $detex = 1;
-}
-
-sub get_docdir {
-  my $d = $ENV{GPDOCDIR} || $ENV{GPHELP_DOCDIR};
-  if (!defined $d) {
-    # work from TOPDIR/Oarch or TOPDIR too: may be uninstalled yet;
-    $d = $0; $d =~ s,/gphelp,,;
-    for ("$datadir", '.', '..', $d) {
-      my $t = "$_/doc";
-      if (-r "$t/translations") { $d = $t; last; }
-    }
-    $d ||= "$datadir/doc";      # Last resort
-  }
-  if ($d =~ /^\./) {
-    eval { require Cwd;
-      $d = Cwd::cwd() . "/$d";
-      $d =~ s,doc/\.\./doc,doc,;
-    }
-  }
-  return $d;
-}
-
-sub init {
-  &inittr();
-
-  $indent = "   ";
-  # avoid Glob.pm! (for minimal Windows install)
-  opendir(DIR, $docdir) || die "$docdir not found";
-  @file_list = grep { /^usersch.*tex/ } readdir(DIR);
-  closedir(DIR);
-
-  chdir($docdir);
-  $docfile = "usersch3.tex";
-  open(IN,"translations") || die("Could not find translation file, docdir='$docdir'");
-  while(<IN>)
-  {
-    chomp; @_ = split(/ *\@ */);
-    $key = shift(@_);
-    $transl{$key} = join('@',@_);
-  }
-  close(IN);
-}
-
-sub not_found {
-  my($help) = shift;
-  $help =~ s/\\\\/_B#K#S_/g;
-  $help =~ s/\\(.)/$1/g;
-  $help =~ s/_B#K#S_/\\/g;
-  print "'$help' not found !\n";
-}
-
-sub choose_chap {
-  while (s/\@([0-9])$//) { $docfile = "usersch$1.tex"; }
-  if (-r $docfile) { $pipe = ""; }
-  else
-  {
-    die "Cannot find $docfile"
-      if (! -r "$docfile.z" &&
-          ! -r "$docfile.gz" &&
-          ! -r "$docfile.Z" &&
-          ! -r "$docfile.bz2");
-    if (-r "$docfile.bz2") {
-        $pipe = $bzcat;
-        $docfile = "$docfile.bz2";
-    } else {
-        $pipe = $zcat;
-    }
-  }
-}
-
-sub safe_setsid {
-  eval {
-    require POSIX;
-    POSIX::setsid(); # detach from terminal (^C will not kill xdvi)
-  };
-}
-
-# assume we're in $docdir
-sub open_viewer_then_quit {
-  my $F = shift;
-  my ($f, $viewer, $redirect);
-  my $win32 = ($^O =~ /(cyg|ms)win/);
-
-  $f = "$F.dvi";
-  $f = "$F.dvi.gz" if (! -f "$f");
-  $f = "$F.pdf"    if (! -f "$f");
-  die "could not find \'$F\'" if (! -f "$f");
-  $F = $f;
-  $redirect = ' 2>/dev/null >/dev/null &';
-  if ($f =~ /\.dvi/)
-  { # DVI
-    $viewer = ($f =~ /refcard/)? $xdviref: $xdvi;
-  }
-  elsif ($win32)
-  { # PDF Win32
-    @_ = split(/"/, `acro.exe`);
-    ($viewer = $_[1]) =~ s,\\,/,g;
-
-    $redirect = "";
-    $F =~ s,/cygdrive/(.),$1:, ; # Reader can't cope with Cygwin paths
-    $F      = "\"$F\"";
-    $viewer = "\"$viewer\"";
-  }
-  else
-  { # PDF generic
-    $viewer = "acroread";
-  }
-
-  print "displaying \'$F\'.";
-  print "\n" if (!$fromgp);
-  safe_setsid();
-  system("$viewer $F$redirect");
-  cleanexit();
-}
-
-sub treat {
-  my($help);
-  $_ = $_[0];
-  s/_QUOTE/'/g;
-  s/_BACKQUOTE/`/g;
-  s/_DOUBQUOTE/"/g;
-  s/^ *"(.*)"([^"]*) *$/$1$2/;
-  if (s/\@$//)
-  {
-    $found = 0;
-    $searchall = 1;
-    $help = $_;
-    for (@file_list)
-    {
-      next if (!/^usersch(.*)\.tex/);
-
-      &treat("$help\@$1");
-      if ($apropos && $#list > 0 || $#sentence_list > 0)
-      {
-        print "\nChapter $1:\n";
-        print "==========\n";
-        &apropos_final_print();
-      }
-    }
-    return not_found($help) if (!$found && !$apropos);
-    $searchall = 0;
-    $apropos = 0; return;
-  }
-  &choose_chap;
-
-  if (!$apropos)
-  {
-    $_ = "users" if (/^$/);
-    open_viewer_then_quit($_) if (/^(users|tutorial|refcard|libpari)$/);
-  }
-
-  if (!$apropos && $transl{$_}) { $_ = $transl{$_}; &choose_chap; }
-  s/(\W)/\\$1/g;
-  s/_/\\\\_/g;
-      ($pipe && open(DOC,"$pipe $docfile |"))
-  || (!$pipe && open(DOC,"$docfile")) || die "Cannot open $docfile: $!";
-  return &apropos($_) if ($apropos);
-
-  if (/^\\[<>=!](\\=)?$/ || /^\\\|\\\||\\&\\&$/ || /\\\||&/ || /===/)
-    { $_ = 'Comparison and Boolean operators'; }
-  $help = $_;
-
-  my ($first);
-  while (<DOC>)
-  {
-    if (/^\\(subsubsec[a-z]*|subsec[a-z]*|section|chapter){$help}/)
-      { $first = $_; last; }
-  }
-  if (eof(DOC))
-  {
-    &not_found($help) if (!$searchall);
-    return;
-  }
-  $found = 1;
-  if (!$detex) { tex($first); }
-  else
-  {
-    &detex(); print "\n" if (!$fromgp);
-    # Avoid broken pipe from zcat
-    do {local $/; <DOC>} if $^O eq 'os2' and $pipe;
-  }
-  close(DOC);
-}
-
-#
-#  A propos
-#
-
-sub apropos_print_list {
-  $current = "";
-  @_ = sort(@_);
-  for (@_)
-  {
-    next if ($_ eq $current);
-    $current = $_; print "$indent$_\n";
-  }
-}
-
-sub apropos_raw_print {
-  $indent = "";
-  &apropos_print_list(@sentence_list);
-  &apropos_print_list(@list);
-}
-
-sub apropos_final_print {
-  my($maxlen) = 0;
-  my($i,$nbcol,$current);
-  my($cols) = ($ENV{'COLUMNS'} || 80) - 1;
-
-  if ($raw) { &apropos_raw_print(); return; }
-  @list = sort(@list);
-  for (@list)
-  {
-    $i= length($_);
-    $maxlen = $i if ($i > $maxlen);
-  }
-  $maxlen++; $nbcol = $cols / $maxlen;
-  $nbcol =~ s/\..*//;
-  $nbcol-- if  ($nbcol * $maxlen == $cols);
-  $nbcol = 1 if (!$nbcol);
-
-  $current = ""; $i = 0;
-  for (@list)
-  {
-    next if ($_ eq $current);
-    $current = $_; print($_); $i++;
-    if ($i >= $nbcol)
-    {
-      $i=0; print "\n"; next;
-    }
-    print " " x ($maxlen - length($_));
-  }
-  print "\n" if ($i);
-  if ($#sentence_list > 0)
-  {
-    print "\nSee also:\n" if ($#list > 0);
-    $indent = "  ";
-    apropos_print_list(@sentence_list);
-  }
-}
-
-sub apropos_check {
-  my($line, $current) = @_;
-  $line =~ s/\n/ /g;
-  return if ($line !~ /$help/i);
-
-  local($_) = $current;
-  s/\\b{(.)}/\\$1/;
-  s/\{\}//g;
-  s/\\pow/^/;
-  s/\\%/%/;
-  s/\\bs/\\/;
-  s/\\\#/\#/g;
-  s,\+\$/\$-,+/-,;
-  if (/ /) { push(@sentence_list,$_); } else { push(@list,$_); }
-}
-
-sub apropos {
-  my($line,$current,$new);
-  $help = $_[0];
-  $help='\\\\pow' if ($help eq '\^');
-  $help='\\\\til' if ($help eq '\~');
-  @sentence_list = @list = "";
-  while (<DOC>)
-  {
-    if (/^\\(subsubsec[a-z]*|subsec[a-z]*|section|chapter){/)
-    {
-      $new = &get_match($_,'{','}');
-      &apropos_check($line, $current);
-      $current = $new; $line = "";
-    }
-    $line .= $_;
-  }
-  &apropos_check($line, $current);
-}
-
-##
-##  Tex Part
-##
-# Actual text is in file TEX. Parimacro + Geometry info goes to WRAP
-sub pretex {
-  my ($basedir) = $ENV{GPHELP_TMPDIR} || $ENV{GPTMPDIR} || $ENV{TMPDIR} || "/tmp";
-  $tmpdir = "$basedir/gp.help$$";
-  mkdir $tmpdir, 0755 || die "Cannot create temporary directory";
-  $texfile = "$tmpdir/gp.help";
-
-  open(TEX,">$texfile.tex") || die "Couldn't open $texfile.tex";
-}
-
-sub tex { my ($first) = @_;
-  print TEX $first;
-  while (<DOC>)
-  {
-    last if /^\\(section|sub[sub]*sec)/i;
-    print TEX;
-  }
-}
-
-sub posttex {
-  my ($wrap) = "$tmpdir/gpwrapper.help";
-  my (@goners) = ("$texfile.tex",
-                  "$wrap.tex", "$wrap.dvi", "$wrap.log", "$wrap.aux");
-  if (!$found) { unlink @goners; rmdir("$tmpdir"); cleanexit(); }
-
-  open(WRAP, ">$wrap.tex") || die "Couldn't open $wrap.tex";
-  if ($balloon) {
-    print WRAP '\nopagenumbers\def\fromgphelp{}'
-    . "\\input $docdir/parimacro.tex"
-    . '\setbox0\vbox{'
-    . "\\input $texfile.tex"
-    . ' }
-\dimen0=\the\ht0 \advance\dimen0 by \dp0
-\advance\dimen0 by 60pt
-\dimen1=\the\wd0
-\advance\dimen1 by 60pt
-\vsize \dimen0
-\hsize \dimen1
-\advance\voffset 30pt\advance\hoffset 30pt
-\advance\hoffset-1in \advance\voffset-1in
-\special{papersize=\the\dimen1,\the\dimen0}
-\noindent\box0
-\end';
-  } else {
-    print WRAP '\nopagenumbers\def\fromgphelp{}'
-    . "\\input $docdir/parimacro.tex"
-    . "\\input $texfile.tex"
-    . '\end';
-  }
-  close(WRAP) || die "Error closing '$wrap.tex': $!";
-  close(TEX) || die "Error closing '$texfile.tex': $!";
-
-  chdir($tmpdir);
-  $out = `tex $wrap.tex 2>&1 < /dev/null`;
-  -f "$wrap.dvi"
-    || die "could not create '$wrap.dvi': status=$?, $out";
-  safe_setsid();
-  my ($goners) = join(" ", @goners);
-  system("($xdvi $wrap.dvi 2>/dev/null >/dev/null; rm -f $goners; rmdir $tmpdir)&");
-}
-
-#
-#  Detex Part
-#
-sub fit_loop {
-  my($i);
-  return if ($miss > 9);
-  while ($miss > 0)
-  {
-#  print "1:$miss ";print @_;print "\n";
-    for (@_) { $miss-- if (s/([?!\.;])$/$1 /);
-       return if ($miss == 0);
-    }
-#  print "2:$miss ";print @_;print "\n";
-    for (@_) { $miss-- if (s/([?!\.;]) $/$1  /);
-       return if ($miss == 0);
-    }
-#  print "3:$miss ";print @_;print "\n";
-    for (@_) { $miss-- if (s/([\),])$/$1 /);
-       return if ($miss == 0);
-    }
-#  print "4:$miss ";print @_;print "\n";
-    $i = 0;
-    for (@_)
-    {
-      if (!$i) { $i = 1; next; }
-      $miss-- if (s/^\(/ (/);
-       return if ($miss == 0);
-    }
-#  print "5:$miss "; print @_;print "\n";
-    for (@_) { $miss--; s/$/ /;
-       return if ($miss == 0);
-    }
-  }
-}
-
-sub fit_line {
-  my($wi, @a);
-  my($l) = -1;
-  my($rem) = $_[0];
-  for (@l)
-  {
-     $l2 = $l; $l += ($_ + 1);
-     last if ($l > $rem);
-     $wi++;
-  }
-  $miss = $rem - $l2;
-  splice(@l, 0, $wi);
-  @a = splice(@w, 0, $wi-1); &fit_loop(@a);
-  push(@a, shift(@w)); return join(' ', @a);
-}
-
-# empty output line
-sub is_void {
-  my($in) = shift;
-  $in =~ s/\@\[\w+\]//g;
-  $in =~ s/\@[012]//g;
-  ($in =~ /^\s*$/)? 1: 0;
-}
-
-sub nl { push(@f_text, shift); }
-
-sub format_text {
-  my($last_void) = 0;
-  my($add_stuff) = 0;
-  my($init) = 1;
-  my($cols) = ($ENV{'COLUMNS'} || 80) - 1;
-  my($first) = $cols - length($indent);
-
-  for (@text)
-  {
-    if (s/^\@1//)       # start verbatim
-    {
-      nl(&fit_line($first)) if (@w);
-      nl("") if (!$last_void && !is_void($_)); # add empty line
-      nl("$indent$_");
-    }
-    elsif (s/^\@0//)    # verbatim lines
-    {
-      nl("$indent$_");
-    }
-    elsif (s/^\@2//)       # end verbatim
-    {
-      nl("$indent$_");
-      $last_void = is_void($_);
-    }
-    elsif (is_void($_))    # line is empty
-    {
-      next if (!$add_stuff);
-      if ($init) {
-        nl(&fit_line($first));
-      } else {
-        nl("") if (!$last_void);
-        nl("\@[endbold]$indent" . &fit_line($first));
-      }
-      while (@w) { nl(&fit_line($cols)); }
-      $init = $last_void = $add_stuff = 0;
-    }
-    else
-    {
-      $add_stuff = 1; s/^ +//;
-      @_ = split(/\s+/, $_);
-      for (@_)
-      {
-        s/\Q$tr{nbrk}/ /g; push(@w, $_);
-        # these codes will be replaced by 1 character
-        s/\@\[(obr|cbr|ouml|uuml|agrav|eacute|ldollar|pm|lt|gt|\{|\})]/\@/g;
-        # the rest will be replaced by zero-width characters
-        s/\@\[\w+\]//g;    push(@l, length($_));
-      }
-    }
-  }
-}
-
-# argument has the form s1${open}s2${close}s3
-# Return 's2'. Set $remainder to 's3'.
-sub get_match {
-  local ($_, $open, $close) = @_;
-  my (@tmp, $arg,$parity,$ok);
-  my ($obr) = 1;
-  $parity = ($open eq $close);
-  /$open/; $_ = $'; # remove everything before (and including) first $open
-
-  while ($_) {
-    @tmp = split(/($open|$close)/);
-    while ($#tmp >= 0) {
-      $_ = shift(@tmp);
-      $obr++ if (/^$open$/);
-      if ($parity && $obr == 2) { $ok = 1; last }
-      $obr-- if (/^$close$/);
-      if (!$obr) { $ok = 1; last }
-      $arg .= $_;
-    }
-    last if ($ok);
-    $_ = <DOC>;
-  }
-  $remainder = join('',@tmp);
-  return $arg;
-}
-
-sub detex {
-  my($fun,$args);
-# 1: get the function "prototype"
-  $fun = &get_match($_,'{','}');
-  # name
-  $fun = &basic_subst($fun);
-  $_ = $remainder;
-  # args as $(x)$ in \subsecidx{sin}$(x)$:
-  if (/^ *\$/)
-  {
-    $args = &basic_subst(&get_match($_,'\$','\$'));
-    $_ = $remainder;
-  }
-  $_ = <DOC> if (!&basic_subst($_));
-  # dft value as (...) in \subsecidx{echo} (default \kbd{0})
-  if (/^ *\(/)
-  {
-    $args .= ' (' . &basic_subst(&get_match($_,'\(','\)')) . ')';
-    $_ = $remainder;
-  }
-  $args .= ":" if ($args !~ /: *$/ && ($args || $fun !~ /: */));
-
-  push(@text, "\@[startbold]$fun\@[endbold]$args");
-  push(@text, "");
-# 2: parse the function description
-  if ($_) { s/^ *://; &presubst(); }
-  while (<DOC>)
-  {
-    last if /^\\(section|sub[sub]*sec)/i;
-    &presubst();
-  }
-  if ($raw) { print join("\n", @text); return; }
-#  for (@text) { print("AA{$_}BB\n"); } # DEBUG
-  &format_text();
-  for (@f_text) { &TeXprint($_); }
-}
-
-# We use the special char @ to transmit special sequences
-sub inittr {
-  @ou = qw( dollar nbrk startbold endbold startcode endcode
-            obr cbr uuml ouml agrave eacute
-            startpodcode endpodcode startlink endlink
-            startbcode endbcode startbi endbi startit endit
-            startword endword startlword endlword pm empty gt lt podleader );
-
-  @tr{@ou} = map "\@[$_]", @ou;
-  $tr{dollar} = '$' if $to_pod;
-
-  %pr = ( dollar => '',
-          ldollar => '$',       # literal dollar
-          nbrk => 'S< >',
-          startbold => 'B<',
-          endbold => '>',
-          startcode => 'C<',
-          startlink => 'L<',
-          endlink => '>',
-          endcode => '>',
-          obr => '{',
-          cbr => '}',
-          startpodcode => 'C<',
-          endpodcode => '>',
-          ( $dumb_pod
-            ? (startbcode => 'B<',
-               endbcode => '>',
-               startbi => 'B<',
-               endbi => '>',)
-            : (startbcode => 'B<C<',
-               endbcode => '>>',
-               startbi => 'B<I<',
-               endbi => '>>')),
-          startit => 'I<',
-          endit => '>',
-          startword => 'F<',
-          endword => '>',
-          startlword => ' F<',
-          endlword => '> ',
-          pm => 'F<+->',
-          "gt" => 'E<gt>',
-          "lt" => 'E<lt>',
-          ouml => 'E<ouml>',
-          uuml => 'E<uuml>',
-          eacute => 'E<eacute>',
-          agrave => 'E<agrave>',
-          empty => 'Z<>',
-          podleader => '=',
-        );
-}
-
-sub indent_equally { my $in = shift; $in =~ s/^[ \t]*/    /mg; $in}
-
-sub basic_subst {
-  local($_) = shift;
-
-  s/(\S)[ \t]*\n[ \t]+/$1\n/gm;
-  s/([^\\])\\\{/$1$tr{obr}/g;
-  s/([^\\])\\\}/$1$tr{cbr}/g;
-  s/([^\\])\\-/$1/g;
-  s/\A\\q?quad(?![a-zA-Z])\s*/$tr{nbrk}$tr{nbrk}/;
-  s|\\wwwsite|$wwwsite|g;
-  s/^\\def\\.*\{\n.*\n\}//gm;
-  s/\\def\\.*//g;
-  s(\\footnote\s*\{?\*+\}?\s*\{\s*((?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*)\})
-    {$tr{startbold}FOOTNOTE$tr{endbold}$tr{lt}$tr{lt}$tr{lt} $1 $tr{gt}$tr{gt}$tr{gt}}g;
-  s/(\{[\w\s]+)\{\}([\s\w]+\})/$1$2/g;  # {nf{}init}
-  s(\\op(?![a-zA-Z])\s*)({\\it op\\/})g;        # {nf{}init}
-  s/\\emacs\b//;
-  s/\\unix\b//;
-  s/\\(leavevmode|strut)(?![a-zA-Z])\s*//g;
-  s/ \\funno \s*
-     { \s* ((?:[^{}]|\{[^{}]*\})*) } \s*
-     { \s* ((?:[^{}]|\{[^{}]*\})*) } \s*
-     { \s* ((?:[^{}]|\{[^{}]*\})*) }
-   /\\noindent{\\tt $1 \$\\key{$2}\$($3)}/gx;
-  s/\\fun\s*\{([^{}]*)\}\s*\{((?:[^{}]|\{[^{}]*\})*)\}\s*\{((?:[^{}]|\{[^{}]*\})*)\}/\\kbd{$1 \\key{$2}($3)}\\sidx{$2}/g;
-
-  s/\\\\(?=[a-zA-Z])/\\bs /g;
-  s/\\b{}\\b{}/\\bs\\bs /g;
-  s/\\\\/\\bs/g;
-  s/(\'\'|\`\`)/"/g unless $to_pod;     # (english) double quotes
-  # asymptotic or isomorphic (~) [beware of ties]
-  s/(^|[^\\]) +~/$1~/;
-  s/~ */~/;
-  s/(^|[^\\])~/$1$tr{nbrk}/g;           # ties
-  s/\\(simeq|sim|approx)(?![a-zA-Z])/ ~ /g;
-  s/\\til(?![a-zA-Z])/~/g;              # ~ (transpose)
-  s/\\(~|tilde)/~/g;
-
-  s/\\(equiv)(?![a-zA-Z])/ = /g;
-  s/\\`a/$tr{agrave}/; s/\\`{a}/$tr{agrave}/;
-  s/\\"o/$tr{ouml}/;   s/\\"{o}/$tr{ouml}/;
-  s/\\"u/$tr{uuml}/;   s/\\"{u}/$tr{uuml}/;
-  s/\\'e/$tr{eacute}/; s/\\'{e}/$tr{eacute}/;
-
-  s/(^|[^\\])%.*/$1/g;                  # comments
-  s/\\vadjust\s*\{\s*\\penalty\s*\d+\s*\}//g;
-
-  # We do not strip %\n, thus:
-  s/\\kbd{\n\s*/\\kbd{/g;
-  s/\$\\bf(\b|(?=[\d_]))\s*([^\$]+)\$/\$$tr{startbcode}$1$tr{endbcode}\$/g;
-  s/\$/$tr{dollar}/g;                   # math mode
-  s/\t/ /g; s/\\,//g; s/\\[ ;]/ /g;     # various spaces
-  s/\\\///g;                    # italic correction
-  s/^&+//g;                     # tab marks
-  s/([^\\])&+/$1 /g;            # tab marks
-  s/\\TeX\{\}/TeX/g;
-  s/\\TeX(\W)/TeX$1/g;
-  s/ *\\circ\b */ o /g;
-  s/\\d?frac{\s*((?:[^{}]|\{[^{}]*\})*)}{\s*((?:[^{}]|\{[^{}]*\})*)}/($1)\/($2)/g;
-  s(\\d?frac\s*(\d)\s*(\d))(($1/$2))g;
-  s[{\s*(\w)\s*\\over(?![a-zA-Z])\s*(\w)\s*}]{($1/$2)}g;
-  s[{\s*((?:[^{}]|\{[^{}]*\})*)\\over(?![a-zA-Z])\s*((?:[^{}]|\{[^{}]*\})*)}][($1)/($2)]g;
-
-  # \def\synt#1#2{\syn{#1}{\tt #2}}
-  # \def\syn#1#2{\synx{#1}{#2}{#1}}
-  s/\\synt?\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}/\\synx{$1}{$2}{$1}/g;
-  # \def\synx#1#2#3{\sidx{#3}The library syntax is $\key{#1}({#2})$}
-  # Often used with embedded {}.
-  s/\\synx\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{((?:[^{}]|\{[^{}]*\})*)\}/\\sidx{$3}The library syntax is $tr{startbold}$1$tr{endbold}$tr{startpodcode}($2)$tr{endpodcode}/;
-
-  # May be used with an empty arg
-  s/\\typ\{([^\}]*)\}/$tr{startcode}t_$1$tr{endcode}/g;
-
-  s/(\\string)?\\_/_/g;
-  s/\\([#\$&%|])/$1/g;
-  s/\\(hat(?![a-zA-Z])|\^)({\\?\s*})?/^/g;
-  s/^(\@\[podleader\]head\d *)\\pow(?![a-zA-z])( *)/$1^$2/gm;
-  s/ *\\pow(?![a-zA-z]) */^/g;
-
-  s/\\neq?(?![a-zA-Z])/ != /g;
-  s/\\enspace(?![a-zA-Z])/ /g;
-  s/\\times(?![a-zA-Z]) */ x /g;
-  s/\\infty(?![a-zA-Z]) */ oo /g;
-  s/ *\\(bmod|mod) */ mod /g;
-  s/ *\\pmod(?![a-zA-Z]) *\{\s*((?:[^{}]|\{[^{}]*\})*)\}/ (mod $1)/g;
-  s/ *\\cdot(?![a-zA-Z]) */./g;         # Maybe " . "?
-  s/ *(\\|\@)[lc]?dots(?![a-zA-Z]) */.../g;
-  s/\\(Cl|log|sin|cos|lim(proj)?|tan|mod|sqrt|exp|ln|det|Re|Im|deg|wp|cap|oplus)(?![a-zA-Z])/$tr{startlword}$1$tr{endlword}/g;
-  s/\\pi(?![a-zA-Z])/$tr{startword}Pi$tr{endword}/g;
-  s/\\(Alpha | Beta | Chi | Delta | Epsilon | Phi | Gamma | Eta | Iota
-      | vartheta | Kappa | Lambda | Mu | Nu | Omicron | Pi | Theta | Rho
-      | Sigma | Tau | Ypsilon | varsigma | Omega | Xi | Psi | Zeta
-      | alpha | beta | chi | delta | epsilon | varepsilon | phi | gamma | eta
-      | iota | varphi | kappa | lambda | mu | nu | omicron | pi | theta | rho
-      | sigma | tau | ypsilon | varpi | omega | xi | psi | zeta
-      | int | expr | seq | args | gcd | lcm | sum | prod | Re | infty )
-      (?![a-zA-Z])/$tr{startword}$1$tr{endword}/xg;
-  s/ *\\in(?![a-zA-Z]) */ belongs to /g;
-  s/\\pm(?![a-zA-Z])/$tr{pm}/g;
-  s/ *\\mid(?![a-zA-Z]) */ | /g;
-
-  s/\\idxtyp\{([^{}]*)\}/\\sidx{t_$1}/g;
-  s/\\ref\{([^\}]*)\}/[$tr{startbold}Label: $1$tr{endbold}]/g unless $to_pod;
-  s/\\secref\{([^\}]*)\}/Section [$tr{startbold}Label: $1$tr{endbold}]/g unless $to_pod;
-  s/\\label\{[^\}]*\}//g unless $to_pod;
-
-  s/\\(noindent|medskip|bigskip|smallskip|left|right)(?![a-zA-Z])[ \t]*//g;
-  s/\\vfill *(\\eject)?//g;
-  s/\\(q|quad)(?![a-zA-Z])\s*/  /g;
-  s/\\qquad(?![a-zA-Z])\s*/    /g;
-
-  s/\\centerline\s*\{\s*(?:\\tt\b\s*)?(.*(\n[ \t].*)*)\}(?=\s*$)/indent_equally($1)/ge;
-  s/\\centerline\s*\{\s*(?:\\tt\b\s*)?((?:[^{}]|\{[^{}]*\})*)\}/ indent_equally($1)/ge;
-
-  s/\\big\b//g;
-
-  s/\\settabs.*//;
-  s/^\\\+/$tr{nbrk}/gm;
-  s/\\\+//g;
-  s/\\cr(?![a-zA-Z])//g;
-  s/\\B(?![a-zA-Z])/\\kbd{BIL}/g;
-
-  s/ *([=><]) */ $1 /g;
-  s/ *<  *([=<]) */ <$1 /g;
-  s/ *>  *([=>]) */ >$1 /g;
-  s/ *([*+-\/^&=|:]) += */ $1= /g;
-  s/ *! *= */ != /g;
-
-  s/ *\\Rightarrow */ ==$tr{gt} /g;
-  s/\\rangle(?![a-zA-Z])\s*/$tr{startcode}$tr{gt}$tr{endcode}/g;
-  s/\\langle(?![a-zA-Z])\s*/$tr{startcode}$tr{lt}$tr{endcode}/g;
-  s/\\rightarrow(?![a-zA-Z])\s*/$tr{startcode}--$tr{gt}$tr{endcode}/g;
-  s/\\longleftrightarrow(?![a-zA-Z])\s*/$tr{startcode}$tr{lt}-----$tr{gt}$tr{endcode}/g;
-  s/\\mapsto(?![a-zA-Z])\s*/$tr{startcode}|---$tr{gt}$tr{endcode}/g;
-  s/ *\\geq?(?![a-zA-Z]) *([^ ])/ $tr{startcode}$tr{gt}=$tr{endcode} $1/g;
-  s/ *\\leq?(?![a-zA-Z]) *([^ ])/ $tr{startcode}$tr{lt}=$tr{endcode} $1/g;
-  s/ *\\gg?(?![a-zA-Z]) *([^ ])/ $tr{startcode}$tr{gt}$tr{gt}$tr{endcode} $1/g;
-  s/ *\\ll?(?![a-zA-Z]) *([^ ])/ $tr{startcode}$tr{lt}$tr{ll}$tr{endcode} $1/g;
-
-  s/\\(vers|PARIversion)(?![a-zA-Z])/$tr{startbold}$version$tr{endbold}/;
-  s/\\([QRCFZNapdf])(?![a-zA-Z])/$tr{startbi}$1$tr{endbi}$2/g;
-  s/\\([QRCFZN])\1(?![a-zA-Z])/$tr{startbi}$1$tr{endbi}$2/g;
-  s/\\Bbb\b\s*(\w)/$tr{startbi}$1$tr{endbi}/g;
-
-  s/\\([oc]br)/$tr{$1}/g;
-  s/\\quo(?![a-zA-Z])/\"/g;
-  s/(^|\s)\{(\w+)\}/$1$2/g;
-
-  s/\\p(?![a-zA-Z])/$tr{startbold}p$tr{endbold}$1/g;
-  s/\\point\{([^\}]*)\}/$tr{startbold}* $1$tr{endbold}/g;
-  s/(\\bullet|\\item)/$tr{startbold}*$tr{endbold}/g;
-  s/\\misctitle\{([^\}]*)\}/$tr{startbold}$1.$tr{endbold}/g;
-  s/\\subsec\{([^\}]*)\}/$tr{startbold}$1.$tr{endbold}/g unless $to_pod;
-  s/\\teb\{([^\}]*)\}/\\sidx{$1}$tr{startbold}$1$tr{endbold}/g;
-  s/\\tet\{([^\}]*)\}/\\sidx{$1}$tr{startcode}$1$tr{endcode}/g;
-  s/\\tev\{([^\}]*)\}/\\sidx{$1}$tr{startit}$1$tr{endit}/g;
-  s/\\\$/$tr{ldollar}/g;
-  s/\\kbd\s*\{\s*</\\kbd{$tr{lt}/g if $to_pod;
-  s/\\kbd\s*\{\s*>/\\kbd{$tr{gt}/g if $to_pod;
-  s/\\kbd\s*\{((?:[^{}]|\{[^{}]*\})*)\}/$tr{startcode}$1$tr{endcode}/g;
-
-  s/\\key\{((?:[^{}]|\{[^{}]*\})*)\}/$tr{startbold}$1$tr{endbold}/g unless $refcard;
-  s/\\goth\{((?:[^{}]|\{[^{}]*\})*)\}/$tr{startbold}$1$tr{endbold}/g;
-
-  if ($refcard) {
-    s/\\(?:key|li)\{((?:[^{}]+(?=[{}])|\{[^{}]*\})*)\}\s*\{\}[ \t]*\n/\n\n=back\n\n$1\n\n=over\n\n/g;
-    s/\\(?:key|li)\{((?:[^{}]+(?=[{}])|\{[^{}]*\})*)\}\s*\{(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/\n=item $tr{startcode}$2$tr{endcode}\n\n$1\n/g;
-  }
-
-  s/\\(floor|ceil|round|binom)\{/$1\{/g;
-  s/\\(var|emph)\{([^\}]*)\}/$tr{startit}$2$tr{endit}/g;
-  s/\\fl(?![a-zA-Z])/$tr{startit}flag$tr{endit}/g;
-  s/\\b{([^}]*)}/$tr{startcode}\\$1$tr{endcode}/g;
-  s/\\kbdsidx/\\sidx/g;
-  s/\\sidx\{[^\}]*\}//g unless $to_pod;
-  s/\\[a-zA-Z]*idx\{([^\}]*)\}/$1/g unless $to_pod;
-  s/{\\text{(st|nd|th)}}/\\text{$1}/g;
-  s/\^\\text{th}/-th/g;
-  s/1\^\\text{st}/1st/g;
-  s/2\^\\text{nd}/2nd/g;
-
-  s/\\(text|hbox|Big)//g;
-  s/^([ \t]+)\{ *\\(it|sl|bf|tt)\b/S<$1>{\\$2/gm;
-  s/\{ *\\(it|sl) *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startit}$2$tr{endit}/g;
-  s/\{ *\\bf *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startbold}$1$tr{endbold}/g;
-  s/\{ *\\tt *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startpodcode}$1$tr{endpodcode}/g;
-  $seek=1 if (s/\\emph{ */$tr{startit}/g);
-  if ($seek) { $seek=0 if (s/\}/$tr{endit}/) }
-  s/\\(backslash|bs)\{(\w)\}/\\$2/g;
-  s/\\(backslash|bs)(?![a-zA-Z]) */\\/g;
-
-  s/\@com(.*)$/$tr{startcode}$1$tr{endcode}/g;
-
-  # Last resort:
-  s/\\kbd\s*\{(.*?)\}/$tr{startcode}$1$tr{endcode}/g;
-  s/^([ \t]{3,})\Q$tr{startcode}\E(.*)\Q$tr{endcode}\E/$1$2/gmo if $to_pod;
-  # Last resort:
-  s/^([ \t]{3,})\Q$tr{startcode}\E(.*?)\Q$tr{endcode}\E/$1$2/gmso if $to_pod;
-  # Remove leading spaces unless have embedded wrapped code:
-  s/^[ \t]+//gm if $to_pod and /^\S/ and not /^[ \t]*\n[ \t]/m;
-  s/\{ *\}//g;                  # empty args
-
-  s{\Q$tr{startcode}\E((ftp|http)://.*?)\Q$tr{endcode}\E}{$tr{startlink}$1$tr{endlink}}go if $to_pod;
-  $_;
-}
-
-sub presubst {
-  chomp;
-  if ($in_prog && /(\\|\@)eprog/)
-  {
-    $in_prog = 0;
-    $_ = "\@2" . &code_subst($`) . $tr{endcode};
-    push(@text, $_);
-    $_ = &basic_subst($');
-  }
-  elsif ($in_prog || s/\\bprog(tabs.*)?//g)
-  {
-    $in_prog++;  # = 1 on the \bprog line
-                 # code should start on the next line
-    $_ = &code_subst($_);
-    s/^/\@1$tr{startcode}/ if ($in_prog == 2);
-    s/^/\@0/ if ($in_prog > 2);
-  }
-  else { $_ = &basic_subst($_); }
-  push(@text, $_);
-}
-
-sub code_subst {
-  my $in = shift;
-  $in =~ s/\@dots\b/.../g;
-  if ($in =~ /\@com(.*)/)
-  {
-    if ($to_pod) {
-      $in = $` . &basic_subst($1) . code_subst($');
-    } else {
-      $in = $` . $tr{endcode} . &basic_subst($1) . $tr{startcode} . code_subst($');
-    }
-  }
-  if ($in =~ /\@Ccom(.*)\*\//)
-  {
-    if ($to_pod) {
-      $in = $` .                &basic_subst($1) . "*/" . &code_subst($');
-    } else {
-      $in = $` . $tr{endcode} . &basic_subst($1) . $tr{startcode}
-                                                 . "*/" . &code_subst($');
-    }
-  }
-  $in;
-}
-
-sub wrap_code {
-  my $in = shift;
-  $in =~ s/^[ \t]+$//mg;
-  $in = &code_subst($in);
-  $in =~ s/^(.)/  $1/mg;
-  $in =~ s/\s*\Z//;
-#  $in =~ s/\\kbd\{((?:[^{}]|\{[^{}]*\})*)\}/$1/g if $to_pod;
-  $in =~ s/\$([^\$\n]*)\$/$1/g if $to_pod;
-  "\n\n$in\n\n";
-}
-
-sub indexify {
-  my $in = shift;
-  $in =~ s/(^|and\s+)(\w+)(\$?\()/$1\\idx{$2}$3/g;
-  $in =~ s/^(\\b\{\w+\})(?!\S)/\\idx{$1}/g;
-  $in;
-}
-
-sub for_index {
-  my $in = shift;
-  1 while $in =~ s/\Q$tr{startcode}\E(.*?)\Q$tr{endcode}\E/$1/go;
-  $in;
-}
-
-sub strip_trail { my $in = shift; $in =~ s/\s+\Z//; $in }
-
-# This subroutine works in paragraph mode
-sub TeXprint_topod {
-  s/\A\s+//;
-  s/^\\def\\.*\{\n.*\n\}//gm;
-  s/\\def\\.*//g;               # Repeated in basic_subst, as the next one
-  s/(\{[\w\s]+)\{\}([\s\w]+\})/$1$2/g;  # {rnf{}llgram}
-
-  s/\\vbox\s*\{\s*\\bprog/\\bprog/g;
-  s/([\\\@])eprog\s*\}/$1eprog/g;
-
-  #  \n is below to prevent splitting on ' '
-  #  We also remove ':'
-  s/\\sectype\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}/\\subsec{Type \\typ{$1} (${2}s)}\n\\sidx{$2}/g;
-  s/\\sectypeindex\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}/\\subsec{Type \\typ{$1} (${2}s)}\n\\sidx{$3}/g;
-  s/\\sectypes\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}\{\s*((?:[^{}]|\{[^{}]*\})*)\}/\\subsec{Type \\typ{$1} and \\typ{$1} (${3}s)}\n\\sidx{$3}/g;
-
-  # Try to guard \label/\sidx (removing possible '.')
-#  This somehow breaks index...
-#  s/(\\(?:section|subsec(?:ref|idx|op)?(unix)?)\s*{(?:(?:[^{}]+(?=[{}])|{[^{}]+})+)})\.?\s*\\(label|sidx)/$1\n\\$2/;
-  s/(\\(?:section|subsec(?:ref|idx|op)?)\s*{(?:(?:[^{}]+(?=[{}])|{[^{}]+})+)})\.?\s*\\(label|sidx)/$1\n\\$2/;
-
-  # last if /\\subsec[\\{}ref]*[\\\${]$help[}\\\$]/o;
-  s/\\chapter\s*{((?:[^{}]|\{[^{}]*\})*)}\s*/\n\n$tr{podleader}head1 NAME\n\nlibPARI - $1\n\n$tr{podleader}head1 DESCRIPTION\n\n/;
-  s/\\appendix\s*{((?:[^{}]|\{[^{}]*\})*)}\s*/\n\n$tr{podleader}head1 NAME\n\nAppendix - $1\n\n$tr{podleader}head1 DESCRIPTION\n\n/;
-  s/\\section\s*{((?:[^{}]|\{[^{}]*\})*)}\s*/"\n\n$tr{podleader}head1 " . indexify($1) . "\n\n"/e;
-
-  # Try to delimit by :
-  s/\\subsec(?:ref|idx|op)?(?:unix)?\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}((\W*default:)?[^\n:]*):\s*/"\n\n$tr{podleader}head2 " . indexify("$1$3") . "\n\n"/e;
-  s/\\subsec(?:ref|idx|op)?(?:unix)?\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}([^\n:]*):\s*/"\n\n$tr{podleader}head2 " . indexify("$1$3") . "\n\n"/e;
-  s/\\subsubsec(?:ref|idx|op)?(?:unix)?\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}([^:]*):\s*/"\n\n$tr{podleader}item " . indexify("$1$3") . "\n\n"/e;
-#  s/\\subsubsec\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}\s*$/"\n\n$tr{podleader}item " . indexify("$1") . "\n\n"/e;
-  s/\\subsubsec\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}(.*)$/"\n\n$tr{podleader}item " . indexify("$1") . "$3\n\n"/me;
-#  s/\\subseckbd\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}:\s*/"\n\n$tr{podleader}head2 " . indexify("$1") . "\n\n"/e;
-  s/\\subseckbd\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}([^:]*):\s*/"\n\n$tr{podleader}head2 " . indexify("$1$3") . "\n\n"/e;
-  # Try to delimit by ' '
-  s/\\subsec(?:ref|idx|op)?(?:unix)?\s*{(([^{}]+(?=[{}])|{[^{}]+})+)}(\S*)\s+/"\n\n$tr{podleader}head2 " . indexify("$1$3") . "\n\n"/e;
-  s/\\subsec(?:ref|title|idx|op)?(?:unix)?\s*{(([^{}]+(?=[{}])|{[^{}]*})+)}:?\s*/"\n\n$tr{podleader}head2 " . indexify("$1") . "\n\n"/e;
-
-  # This is to skip preface in refcard:
-  /\Q$tr{podleader}\Ehead1|\\title(?![a-zA-Z])\s*\{/o and $seen_start = 1
-    or $seen_start or return;   # Skip now!
-
-  s/\\title\s*\{([^{}\s]*)(\s+([^{}]*))?\}(\s*\\centerline\s*\{([^{}]*)\})?\s*/$tr{podleader}head1 NAME\n\n$1 - $3.  $5\n\n/ and $seen_title++
-    unless $seen_title;
-  s/\\title\s*\{([^{}\s]*)(\s+([^{}]*))?\}(\s*\\centerline\s*\{([^{}]*)\})?\s*/\n\n/;
-  s/\\parskip.*/\n/g;           # Up to end of the line
-  #s/([A-Z])\</$1 < /g;         # Disambiguate with POD...
-
-  # Duplicate removal of settabs, since they may contain \hskip
-  s/\\settabs.*//;
-  s/^[ \t]*\\hskip\s*\w+/$tr{nbrk}/g;
-  s/[ \t]*\\hskip\s*\w+/\n$tr{nbrk}/g;
-  1 while s/ \\
-             ( (small|big)skip | newcolumn | noindent
-             | (short)?copyrightnotice | hfill | break | par
-             | leavevmode | strut | endgroup | bye
-             )
-             (?![a-zA-Z])[ \t]*(\n\s*)
-             /\n\n/gx;
-
-  s/'(\W)'/{\\tt '$1'}/g;
-  s/(\\\w+)(\\hbox)/$1 $2/g;
-  s/\\hbox\s*\{(?:\\it\b\s*)?((?:\\[\{\}]|[^{}]|\{[^{}]*\})*)\}/$1/g;
-
-  # substitute non-verbatim code
-  $acc = '';
-  pos = 0;
-  while ( s/\A(.*?)\\bprog//s ) {
-    $acc .= basic_subst(strip_trail($1));
-    $_ .= <DOC> until /(\\|@)eprog\b/ or eof(DOC);
-    $acc .= wrap_code($1) if s/\A(?:tabs[^\n]*)?(?![a-zA-Z])[ \t]*\n?(.*?)(\\|@)eprog\s*//s;
-  }
-  $_ = $acc . basic_subst($_);
-
-#  s/\\kbd\{/\{\\tt /g;         # startcode
-#  s/\\typ\{/\{\\tt t_/g;       # startcode
-
-  s/\$\s*(\@\[startbi\][A-Z]\@\[endbi\])\s*\$/$1/g;
-#  s/\\p(\b|(?=[\d_]))/B<p>/g;
-  #s/\$\\bf\b\s*([^\$]+)\$/C<B<$1>>/g;
-
-  @lines = split /^$/m, $_;
-  for (@lines) {
-    s/>/\@[gt]/g unless /^\n*[ \t]/;
-    s/</\@[lt]/g unless /^\n*[ \t]/;
-  }
-  $_ = join '', @lines;
-
-  s/\$\$(.*?)\$\$\s*/\n\nS<  >$tr{startcode}$1$tr{endcode}\n\n/gs;
-  s/\$([^\$]+)\$/$tr{startcode}$1$tr{endcode}/g;
-
-  s/\\s(?:ref|idx){\s*([^{}]*)}/"X<" . for_index($1) . ">"/ge; #
-  s/\\(?:ref|idx){\s*([^{}]*)}/"X<" . for_index($1) . ">$1"/ge;
-
-# Conflict between different versions of PARI and refcard:
-# s/\\(?:key|li)\s*{(.*)}\s*{(.+)}[ \t]*\n/\n\n=item C<$2>\n\n$1\n\n/msg;
-# s/\\(?:key|li)\s*{(.*)}\s*{}[ \t]*\n/\n\n=back\n\n$1\n\n=over\n\n/mgs;
-# s/\\(key|var)(?![a-zA-Z])\s*{(\w+)}/C<$2>/mg;
-  s/\\var\s*{X<(\w+)>(\w+)}/X<$1>$tr{startcode}$2$tr{endcode}/mg;
-  s/\\var\s*{f{}lag}/$tr{startcode}flag$tr{endcode}/mg;
-
-  s/\\metax(?![a-zA-Z])\s*{(.*)}\s*{\s*(\w+)(?=C\<)(.*)}[ \t]*\n/\n\n=item C<L<$2>$3>\n\n$1\n\n/mg;
-  s/\\metax(?![a-zA-Z])\s*{(.*)}\s*{(.*)}[ \t]*\n/\n\n=item C<$2>\n\n$1\n\n/mg;
-  s/C\<\{\}=/C\<=/g;
-  s/\\fl(?![a-zA-Z])/I<flag>/g;
-  s/\\file(?![a-zA-Z])/F<file>/g;
-  s/\\(unix|emacs)\b\s*(\{?)(\s*\\(no)?indent)?\s*/X<\U$1>$2/g;
-  s/\A\\label\s*\{([\w:.-]*)\}([ \t]*\n\s*(?=[^\s=]))?/X<Label $1>/g;
-  s/\\label\s*\{([\w:.-]*)\}/X<Label $1>/g;
-  s/\\secref\s*\{([\w:.-]*)\}/L<Label $1>/g;
-  s/\\begin(double)?indentedkeys\s*/\n\n=over\n\n/g;
-  s/\\end(double)?indentedkeys\s*/\n\n=back\n\n/g;
-  # begin/end group appear in very special context only
-  s/\\begingroup\W.*//s;                # Eat to the end
-  s/\n{3,}/\n\n/g;
-  s/\\subsec\{((?:[^{}]|\{[^{}]*\})+)\}\s*/\n\n=back\n\nB<$1>\n\n=over\n\n/g; # In refcard
-  # for refcard:
-  s/{\\rm(?![a-zA-Z])\s*([^{}]*)}/$1/g;
-  s/\\Z<>/\\/g;                 # Optimize for readability
-
-  # Now replace the POD stuff
-  # Start with cosmetic stuff:
-  $in_code = 0;
-  s/(\@\[((start)|end)code\])/ ($3 ? $in_code++ : --$in_code) ? "" : $1 /ge;
-
-  if ($dumb_pod) {
-    my @stack;
-    s /(\@\[((start)|end)(\w+)\])/
-      if ($3) {                 # Start
-        push @stack, $4;
-        (@stack > 1 ? "\@[end$stack[-2]]" : '') . $1
-      } else {                  # end
-        pop @stack;
-        $1 . (@stack ? "\@[start$stack[-1]]" : '')
-      }
-      /ge
-  }
-  1 while s/\@\[start(\w+)\](\s*)\@\[end\1\]/$2/g;
-
-  s/\@\[(\w+)\]/\@!$pr{$1}/g;
-  s/(\\\w+)\@!(\w)/$1 $2/g;
-  s/\@!//g;
-  s/\\([\{\}])/$1/g;
-
-  # Normalize the spacing
-  s/\n{3,}/\n\n/;
-  s/\A([ \t]*\n)+//;
-  # Single label is not healthy...
-  print "\n" if $last_glued and /\A=/; # POD markup needs a new paragraph
-  $last_glued = s/((\A|\n\n)(X<[^<>]+>)+)[ \t]*\n\n/$1\n/;
-
-  print;
-}
-
-sub color {
-  my($a);
-  $_ = $_[0];
-  if (/[^0-9]/ || $_ < 0 || $_ > 17)
-    { print "bad color in gphelp: $_\n"; return ""; }
-  if ($_ < 8) { $a = $_ + 30; } else { $a = $_ + 82; }
-  return "\e[0;${a}m";
-}
-
-sub TeXprint {
-  local($_) = $_[0];
-  s/\@\[obr\]/{/g;
-  s/\@\[cbr\]/}/g;
-  s/\@\[ouml\]/"o/g;
-  s/\@\[uuml\]/"u/g;
-  s/\@\[agrave\]/`a/g;
-  s/\@\[eacute\]/'e/g;
-  s/\@\[ldollar\]/\$/g;
-  s/\@\[end(bold|code|bcode|bi|it)\]/$ch/g;
-  s/\@\[start(bold|code|bcode|bi)\]/$cb/g;
-  s/\@\[startit\]/$cu/g;
-  s/\@\[(dollar|empty|endl?word|endpodcode|startl?word|startpodcode)\]//g;
-  s/\@\[pm\]/+\/-/g;
-  s/\@\[lt\]/</g;
-  s/\@\[gt\]/>/g;
-  s/\\([\{\}])/$1/g;
-  s/\@\[nbrk\]/ /g; print "$_\n";
-}
-
-sub to_pod {
-  $to_pod = $ARGV[1];
-  inittr();
-  $parifile = $to_pod;
-  %compress = ('.gz', 'gzip -cd',
-               '.z', 'gzip -cd',
-               '.Z', 'zcat',
-              );
-  foreach $suffix (keys %compress) {
-    ($patt = $suffix) =~ s/(\W)/\\$1/;
-    if ($to_pod =~ /$patt$/) { $pipe = $compress{$suffix}; last; }
-  }
-  if ($pipe) {
-    open(DOC,"$pipe $parifile |") ||
-      die "Cannot open pipe $pipe from $parifile: $!, stopped";
-  } else {
-    open(DOC,$parifile) || die "Cannot find file $parifile: $!, stopped";
-  }
-  $/='';                        # Paragraph mode
-  while (<DOC>) {
-    &TeXprint_topod();
-  }
-  if ($pipe) {
-    close(DOC) || die "Cannot close pipe `$pipe $parifile': $!, stopped";
-  } else {
-    close(DOC) || die "Cannot close file $parifile: $!, stopped";
-  }
-  cleanexit();
-}

new file patches/gphelp.in.patch

@@ +1 @@
+--- doc/gphelp.in       (revision 12541)
++++ doc/gphelp.in       (working copy)
+@@ -51,6 +51,8 @@
+ $xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
+ $gzip = "gzip";
+ $zcat = "$gzip -dc";
++$bzip = "bzip2";
++$bzcat = "$bzip -dc";
+ $docdir = &get_docdir();
+ 
+ $refcard = (@ARGV and $ARGV[-1] =~ /refcard/i);
+@@ -112,6 +114,8 @@
+   $cu .= $cu ? "\e[1m": "\e[4m";
+   $cb .= "\e[1m";
+   $detex = 1 if (!$ENV{DISPLAY});
++  # Disable TeX for Sage.
++  $detex = 1;
+ }
+ 
+ sub get_docdir {
+@@ -171,8 +175,14 @@
+     die "Cannot find $docfile"
+       if (! -r "$docfile.z" &&
+           ! -r "$docfile.gz" &&
+-          ! -r "$docfile.Z");
+-    $pipe = $zcat;
++          ! -r "$docfile.Z" &&
++         ! -r "$docfile.bz2");
++    if (-r "$docfile.bz2") {
++       $pipe = $bzcat;
++       $docfile = "$docfile.bz2";
++    } else {
++       $pipe = $zcat;
++    }
+   }
+ }
+ 

deleted file patches/gphelp.patch

@@ -1 @@
---- ../src/doc/gphelp.in        2006-03-06 10:05:00.000000000 -0800
-+++ gphelp.in   2007-12-26 21:35:54.000000000 -0800
-@@ -51,6 +51,8 @@
- $xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
- $gzip = "gzip";
- $zcat = "$gzip -dc";
-+$bzip = "bzip2";
-+$bzcat = "$bzip -dc";
- $docdir = &get_docdir();
- 
- $refcard = (@ARGV and $ARGV[-1] =~ /refcard/i);
-@@ -115,6 +117,8 @@
-   $cu .= $cu ? "\e[1m": "\e[4m";
-   $cb .= "\e[1m";
-   $detex = 1 if (!$detex && !$ENV{DISPLAY});
-+  # Disable TeX for Sage.
-+  $detex = 1;
- }
- 
- sub get_docdir {
-@@ -175,8 +179,14 @@
-     die "Cannot find $docfile"
-       if (! -r "$docfile.z" &&
-           ! -r "$docfile.gz" &&
--          ! -r "$docfile.Z");
--    $pipe = $zcat;
-+          ! -r "$docfile.Z" &&
-+         ! -r "$docfile.bz2");
-+    if (-r "$docfile.bz2") {
-+       $pipe = $bzcat;
-+       $docfile = "$docfile.bz2";
-+    } else {
-+       $pipe = $zcat;
-+    }
-   }
- }
- 

new file patches/init.c.patch

@@ +1 @@
+--- src/language/init.c (revision 12541)
++++ src/language/init.c (working copy)
+@@ -19,6 +19,7 @@
+ /*                                                                 */
+ /*******************************************************************/
+ #include <string.h>
++#include <stdlib.h>  /* patch for Sage */
+ #include "pari.h"
+ #include "paripriv.h"
+ #include "anal.h"
+@@ -684,6 +685,7 @@
+ static void
+ pari_exit(void)
+ {
++  abort(); /* patch for Sage */
+   fprintferr("  ***   Error in the PARI system. End of program.\n");
+   exit(1);
+ }

new file patches/mp.c.patch

@@ +1 @@
+--- src/kernel/gmp/mp.c (revision 12541)
++++ src/kernel/gmp/mp.c (working copy)
+@@ -56,7 +56,9 @@
+ int pari_kernel_init(void)
+ {
+   /* Use pari_malloc instead of malloc */
++  /* patch for Sage
+   mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free);
++  */
+   return 0;
+ }
+ 

deleted file patches/paripriv-Solaris.h

@@ -1 @@
-/* $Id: paripriv.h 12463 2010-06-23 21:57:27Z bill $
-
-Copyright (C) 2004  The PARI group.
-
-This file is part of the PARI/GP package.
-
-PARI/GP 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. It is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY WHATSOEVER.
-
-Check the License for details. You should have received a copy of it, along
-with the package; see the file 'COPYING'. If not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-BEGINEXTERN
-/* hashtables */
-hashtable *hashstr_import_static(hashentry *e, ulong size);
-void hashstr_dbg(hashtable *h);
-
-/* for qsort */
-typedef int (*QSCOMP)(const void *, const void *);
-
-/* for (ulong*) GENs */
-typedef ulong *uGEN;
-#define ucoeff(a,i,j)  (((uGEN*)(a))[j][i])
-#define ugel(a,i) ((uGEN*)(a))[i]
-
-/* swap */
-#define lswap(x,y) {long _z=x; x=y; y=_z;}
-#define pswap(x,y) {GEN *_z=x; x=y; y=_z;}
-#define swap(x,y)  {GEN  _z=x; x=y; y=_z;}
-#define dswap(x,y) { double _t=x; x=y; y=_t; }
-#define pdswap(x,y) { double* _t=x; x=y; y=_t; }
-#define swapspec(x,y, nx,ny) {swap(x,y); lswap(nx,ny);}
-
-/* unused */
-GEN ellheightoo(GEN e, GEN z, long prec);
-void ellprint(GEN e);
-
-/* generic */
-GEN trans_fix_arg(long *prec, GEN *s0, GEN *sig, pari_sp *av, GEN *res);
-GEN transc(GEN (*f) (GEN, long), GEN x, long prec);
-GEN sort_factor_pol(GEN y, int (*cmp)(GEN,GEN));
-
-/* loops */
-GEN incloop(GEN a);
-GEN resetloop(GEN a, GEN b);
-GEN setloop(GEN a);
-
-/* parser */
-void forpari(GEN a, GEN b, GEN node);
-void untilpari(GEN a, GEN b);
-void whilepari(GEN a, GEN b);
-GEN  ifpari(GEN g, GEN a, GEN b);
-GEN  andpari(GEN a, GEN b);
-GEN  orpari(GEN a, GEN b);
-void ifpari_void(GEN g, GEN a, GEN b);
-GEN  geval_gp(GEN x, GEN t);
-
-GEN  gadde(GEN *x, GEN y);
-GEN  gadd1e(GEN *x);
-GEN  gdive(GEN *x, GEN y);
-GEN  gdivente(GEN *x, GEN y);
-GEN  gdivrounde(GEN *x, GEN y);
-GEN  gmode(GEN *x, GEN y);
-GEN  gmule(GEN *x, GEN y);
-GEN  gshiftle(GEN *x, long n);
-GEN  gshiftre(GEN *x, long n);
-GEN  gstore(GEN *x, GEN y);
-GEN  gsube(GEN *x, GEN y);
-GEN  gsub1e(GEN *x);
-GEN  gshift_right(GEN x, long n);
-
-GEN  derivnum0(GEN a, GEN code, long prec);
-GEN  derivnum1(GEN code, GEN args, long prec);
-GEN  direuler0(GEN a, GEN b, GEN code, GEN c);
-GEN  divsum(GEN num, GEN code);
-void fordiv(GEN a, GEN code);
-void forell(long a, long b, GEN code);
-void forprime(GEN a, GEN b, GEN code);
-void forstep(GEN a, GEN b, GEN s, GEN code);
-void forsubgroup(GEN cyc, GEN bound, GEN code);
-void forvec(GEN x, GEN code, long flag);
-GEN  intcirc0(GEN a, GEN R, GEN code, GEN tab, long prec);
-GEN  intfourcos0(GEN a, GEN b, GEN x, GEN code, GEN tab, long prec);
-GEN  intfourexp0(GEN a, GEN b, GEN x, GEN code, GEN tab, long prec);
-GEN  intfoursin0(GEN a, GEN b, GEN x, GEN code, GEN tab, long prec);
-GEN  intfuncinit0(GEN a, GEN b, GEN code, long flag, long m, long prec);
-GEN  intlaplaceinv0(GEN sig, GEN x, GEN code, GEN tab, long prec);
-GEN  intmellininv0(GEN sig, GEN x, GEN code, GEN tab, long prec);
-GEN  intnum0(GEN a, GEN b, GEN code, GEN tab, long prec);
-GEN  intnuminit0(GEN a, GEN b, GEN tab, long prec);
-GEN  intnuminitgen0(GEN a, GEN b, GEN code, long m, long flag, long prec);
-GEN  intnumromb0(GEN a, GEN b, GEN code, long flag, long prec);
-GEN  matrice(GEN nlig, GEN ncol, GEN code);
-GEN  prodeuler0(GEN a, GEN b, GEN code, long prec);
-GEN  prodinf0(GEN a, GEN code, long flag, long prec);
-GEN  produit(GEN a, GEN b, GEN code, GEN x);
-GEN  somme(GEN a, GEN b, GEN code, GEN x);
-GEN  sumalt0(GEN a, GEN code,long flag, long prec);
-GEN  suminf0(GEN a, GEN code, long prec);
-GEN  sumnum0(GEN a, GEN sig, GEN code, GEN tab, long flag, long prec);
-GEN  sumnumalt0(GEN a, GEN sig, GEN code, GEN tab, long flag, long prec);
-GEN  sumnuminit0(GEN a, GEN tab, long sgn, long prec);
-GEN  sumpos0(GEN a, GEN code, long flag,long prec);
-GEN  vecteursmall(GEN nmax, GEN code);
-GEN  vecteur(GEN nmax, GEN n);
-GEN  vvecteur(GEN nmax, GEN n);
-GEN  zbrent0(GEN a, GEN b, GEN code, long prec);
-
-long    loop_break(void);
-
-/* multiprecision */
-GEN   addrex01(GEN x);
-int   lgcdii(ulong* d, ulong* d1, ulong* u, ulong* u1, ulong* v, ulong* v1, ulong vmax);
-ulong rgcduu(ulong d, ulong d1, ulong vmax, ulong* u, ulong* u1, ulong* v, ulong* v1, long *s);
-ulong xgcduu(ulong d, ulong d1, int f, ulong* v, ulong* v1, long *s);
-ulong xxgcduu(ulong d, ulong d1, int f, ulong* u, ulong* u1, ulong* v, ulong* v1, long *s);
-GEN   divgunu(GEN x, ulong i);
-GEN   divrunu(GEN x, ulong i);
-GEN   init_remiimul(GEN M);
-GEN   logagmcx(GEN q, long prec);
-GEN   muliispec(GEN x, GEN y, long nx, long ny);
-GEN   red_montgomery(GEN T, GEN N, ulong inv);
-GEN   remiimul(GEN x, GEN y, GEN invy);
-GEN   sqrispec(GEN x, long nx);
-GEN   subrex01(GEN x);
-GEN   modr_safe(GEN x, GEN y);
-ulong *convi(GEN x, long *l);
-
-int approx_0(GEN x, GEN y);
-GEN bernfrac_using_zeta(long n);
-int OK_bern(long nb, long prec);
-
-/* powers */
-GEN    rpowuu(ulong a, ulong n, long prec);
-ulong  u_pow10(int n);
-
-/* floats */
-double dabs(double s, double t);
-void   dcxlog(double s, double t, double *a, double *b);
-double dnorm(double s, double t);
-double dbllog2(GEN z);
-ulong  usqrtsafe(ulong a);
-
-/* "abs" routines for t_REAL ( disregard sign ) */
-int absrnz_egal1(GEN x);
-int absrnz_egal2n(GEN x);
-
-/* hnf */
-GEN hnfadd(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
-GEN hnfadd_i(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
-GEN hnfspec_i(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
-GEN hnfspec(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
-GEN mathnfspec(GEN x, GEN *ptperm, GEN *ptdep, GEN *ptB, GEN *ptC);
-
-GEN LLL_check_progress(GEN Bnorm, long n0, GEN m, int final, long *ti_LLL);
-GEN extendedgcd(GEN A);
-
-/* miscellaneous linear algebra */
-GEN  imagecomplspec(GEN x, long *nlze);
-void rowselect_p(GEN A, GEN B, GEN p, long init);
-
-GEN  dim1proj(GEN prh);
-GEN  detcyc(GEN cyc, long *L);
-
-GEN merge_factor_i(GEN f, GEN g);
-
-/* integer factorization / discrete log */
-GEN   coprime_part(GEN x, GEN f);
-ulong ucoprime_part(ulong x, ulong f);
-ulong is_kth_power(GEN x, ulong p, GEN *pt, byteptr d);
-long  ifac_decomp_break(GEN n, long (*B)(GEN,GEN,GEN,GEN), GEN s, long hint);
-long  ifac_moebius(GEN n, long hint);
-long  ifac_issquarefree(GEN n, long hint);
-long  ifac_omega(GEN n, long hint);
-long  ifac_bigomega(GEN n, long hint);
-GEN   ifac_totient(GEN n, long hint);
-GEN   ifac_numdiv(GEN n, long hint);
-GEN   ifac_sumdivk(GEN n, long k, long hint);
-GEN   mpqs(GEN N);
-ulong gcduodd(ulong x, ulong y);
-long  Z_lvalrem_stop(GEN n, ulong p, int *stop);
-long  u_lvalrem_stop(ulong *n, ulong p, int *stop);
-
-/* Polynomials */
-/* a) Arithmetic/conversions */
-GEN  addmulXn(GEN x, GEN y, long d);
-GEN  addshiftpol(GEN x, GEN y, long d);
-GEN  lift_if_rational(GEN x);
-GEN  monomial(GEN a, long degpol, long v);
-GEN  monomialcopy(GEN a, long degpol, long v);
-GEN  mulmat_pol(GEN A, GEN x);
-GEN  ser2pol_i(GEN x, long lx);
-GEN  ser2rfrac_i(GEN x);
-GEN  shiftpol_i(GEN x, long v);
-GEN  swap_vars(GEN b0, long v);
-GEN  RgX_recipspec_shallow(GEN x, long l, long n);
-
-/* b) Modular */
-GEN  bezout_lift_fact(GEN T, GEN Tmod, GEN p, long e);
-GEN  Kronecker_to_FpXQX(GEN z, GEN pol, GEN p);
-GEN  FpX_quad_root(GEN x, GEN p, int unknown);
-long FpX_split_Berlekamp(GEN *t, GEN pp);
-GEN  FqX_split_all(GEN z, GEN T, GEN p);
-long FqX_split_by_degree(GEN *pz, GEN u, GEN q, GEN T, GEN p);
-long FqX_split_deg1(GEN *pz, GEN u, GEN q, GEN T, GEN p);
-GEN  FqX_split_roots(GEN z, GEN T, GEN p, GEN pol);
-GEN  polsym_gen(GEN P, GEN y0, long n, GEN T, GEN N);
-GEN  ZXQ_charpoly_sqf(GEN A, GEN B, long *lambda, long v);
-GEN  ZX_disc_all(GEN,ulong);
-GEN  ZX_resultant_all(GEN A, GEN B, GEN dB, ulong bound);
-/* 
-Coment out the following two lines, as they cause problems on 
-Solaris. I was originally going to do this on all platforms, not just 
-Solaris, but I noticed there was already an altered partpriv-osx.h, 
-so this modified version will only be copied over if using Solaris. 
-GEN  ZY_ZXY_resultant_all(GEN A, GEN B0, long *lambda, GEN *LPRS);
-*/
-GEN  RgX_gcd_simple(GEN x, GEN y);
-GEN  RgX_extgcd_simple(GEN a, GEN b, GEN *pu, GEN *pv);
-GEN  RgXQ_minpoly_naive(GEN y, GEN P);
-GEN lift_intern0(GEN x,long v);
-#define lift_intern(x) (lift_intern0((x),-1))
-
-/* c) factorization */
-double cauchy_bound(GEN p);
-GEN chk_factors_get(GEN lt, GEN famod, GEN c, GEN T, GEN N);
-long cmbf_maxK(long nb);
-GEN ZX_DDF(GEN x);
-GEN fact_from_DDF(GEN fa, GEN e, long n);
-GEN initgaloisborne(GEN T, GEN dn, long prec, GEN *pL, GEN *pprep, GEN *pdis);
-GEN logmax_modulus_bound(GEN p);
-GEN polint_i(GEN xa, GEN ya, GEN x, long n, GEN *ptdy);
-GEN quicktrace(GEN x, GEN sym);
-GEN special_pivot(GEN x);
-GEN vandermondeinversemod(GEN L, GEN T, GEN den, GEN mod);
-GEN ZX_monic_factorpadic(GEN f, GEN p, long prec);
-
-/* Finite field */
-
-enum { t_FF_FpXQ = 0, t_FF_Flxq = 1, t_FF_F2xq = 2 };
-
-/* for Buchall_param */
-enum { fupb_NONE, fupb_RELAT, fupb_LARGE, fupb_PRECI };
-
-/* Allocation / gerepile */
-void   debug_stack(void);
-void   fill_stack(void);
-void   init_dalloc(void);
-double *dalloc(size_t n);
-void   gerepilecoeffs2(pari_sp av, GEN x, int n, GEN y, int o);
-void   minim_alloc(long n, double ***q, GEN *x, double **y,  double **z, double **v);
-int    pop_entree_block(entree *ep, long loc);
-int    pop_val_if_newer(entree *ep, long loc);
-void   gclone_refc(GEN x);
-
-/* Interfaces (GP, etc.) */
-pariFILE *pari_last_tmp_file();
-void  print_errcontext(const char *msg, const char *s, const char *entry);
-void* get_stack(double fraction, long min);
-void  init_graph(void);
-void  free_graph(void);
-void  initout(int initerr);
-void  init80col(void);
-int   pari_kernel_init(void);
-int   pari_last_was_newline(void);
-void  pari_set_last_newline(int last);
-void  print_functions_hash(const char *s);
-void  print_all_user_fun(int member);
-GEN   readbin(const char *name, FILE *f, int *vector);
-void  term_color(long c);
-const char *term_get_color(long c);
-int   term_height(void);
-int   term_width(void);
-void  whatnow_new_syntax(const char *f, long n);
-/* gp_colors */
-void decode_color(long n, long *c);
-enum { c_ERR, c_HIST, c_PROMPT, c_INPUT, c_OUTPUT, c_HELP, c_TIME, c_LAST,
-       c_NONE = 0xffffUL };
-extern GEN pari_colormap, pari_graphcolors;
-
-/* defaults */
-extern ulong precreal;
-
-/* history */
-typedef struct {
-  GEN *res;    /* array of previous results, FIFO */
-  size_t size; /* # res */
-  ulong total; /* # of results computed since big bang */
-} gp_hist;
-
-/* prettyprinter */
-typedef struct {
-  pariFILE *file;
-  char *cmd;
-} gp_pp;
-
-/* path */
-typedef struct {
-  char *PATH;
-  char **dirs;
-} gp_path;
-
-/* for output */
-typedef struct {
-  char format; /* e,f,g */
-  long sigd;   /* -1 (all) or number of significant digits printed */
-  int sp;      /* 0 = suppress whitespace from output */
-  int prettyp; /* output style: raw, prettyprint, etc */
-  int TeXstyle;
-} pariout_t;
-
-void lim_lines_output(char *s, long n, long max);
-void gen_output(GEN x, pariout_t *T);
-
-void parsestate_reset(void);
-void parsestate_save(struct pari_parsestate *state);
-void parsestate_restore(struct pari_parsestate *state);
-
-void compilestate_reset(void);
-void compilestate_save(struct pari_compilestate *comp);
-void compilestate_restore(struct pari_compilestate *comp);
-
-void evalstate_clone(void);
-void evalstate_reset(void);
-void evalstate_restore(struct pari_evalstate *state);
-void evalstate_save(struct pari_evalstate *state);
-
-/* GP_DATA */
-typedef struct {
-  gp_hist *hist;
-  gp_pp *pp;
-  gp_path *path;
-  pariout_t *fmt;
-  ulong flags, lim_lines;
-  char *help, *prompt, *prompt_cont;
-  pari_timer *T;
-} gp_data;
-  /* GP_DATA->flags */
-/* 
-
-Coment out the following two enum, as it causes problems on 
-Solaris. I was originally going to do this on all platforms, not just 
-Solaris, but I noticed there was already an altered partpriv-osx.h, 
-so this modified version will only be copied over if using Solaris. 
-enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
-       USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512, BREAKLOOP=1024,
-       RECOVER=2048};
-*/
-
-extern gp_data *GP_DATA;
-
-typedef struct Buffer {
-  char *buf;
-  ulong len;
-  jmp_buf env;
-} Buffer;
-Buffer *new_buffer(void);
-void delete_buffer(Buffer *b);
-void fix_buffer(Buffer *b, long newlbuf);
-
-typedef struct {
-  const char *s; /* source */
-  char *t, *end; /* target, last char read */
-  int in_string, in_comment, more_input, wait_for_brace, downcase;
-  Buffer *buf;
-} filtre_t;
-void init_filtre(filtre_t *F, Buffer *buf);
-char *filtre(const char *s, int flag);
-void check_filtre(filtre_t *F);
-
-gp_data *default_gp_data(void);
-GEN  gp_history(gp_hist *H, long p, char *old, char *entry);
-
-void delete_dirs(gp_path *p);
-void gp_expand_path(gp_path *p);
-const char *pari_default_path(void);
-const char *expand_prompt(const char *prompt, filtre_t *F);
-
-typedef struct input_method {
-/* mandatory */
-  char * (*fgets)(char *,int,FILE*);
-  char * (*getline)(char**, int f, struct input_method*, filtre_t *F);
-  int free; /* boolean: must we free the output of getline() ? */
-/* for interactive methods */
-  const char *prompt, *prompt_cont;
-/* for non-interactive methods */
-  FILE *file;
-} input_method;
-
-int input_loop(filtre_t *F, input_method *IM);
-char *file_input(char **s0, int junk, input_method *IM, filtre_t *F);
-char *file_getline(Buffer *b, char **s0, input_method *IM);
-
-/* By files */
-
-/* Flx.c */
-
-GEN     FlxX_recipspec(GEN x, long l, long n, long vs);
-GEN     FlxX_sub(GEN x, GEN y, ulong p);
-GEN     FlxX_subspec(GEN x, GEN y, ulong p, long lx, long ly);
-GEN     FlxX_swap(GEN x, long n, long ws);
-GEN     zxX_to_Kronecker(GEN P, GEN Q);
-GEN     zxX_to_Kronecker_spec(GEN P, long lp, GEN Q);
-GEN     Flx_addshift(GEN x, GEN y, ulong p, long d);
-GEN     Flx_addspec(GEN x, GEN y, ulong p, long lx, long ly);
-GEN     Flx_even_odd_comb(GEN P, ulong u, ulong v, ulong p);
-GEN     Flx_mulspec(GEN a, GEN b, ulong p, long na, long nb);
-GEN     Flx_negspec(GEN x, ulong p, long l);
-GEN     Flx_recipspec(GEN x, long l, long n);
-GEN     Flx_sqrspec(GEN a, ulong p, long na);
-GEN     Flx_subspec(GEN x, GEN y, ulong p, long lx, long ly);
-GEN     Kronecker_to_FlxqX(GEN z, GEN T, ulong p);
-GEN     FlxqX_invMontgomery(GEN T, GEN Q, ulong p);
-GEN     FlxqX_mulspec(GEN x, GEN y, GEN T, ulong p, long lx, long ly);
-GEN     FlxqX_rem_Montgomery(GEN x, GEN mg, GEN T, GEN Q, ulong p);
-
-/* Qfb.c */
-
-GEN     redimagsl2(GEN q, GEN *U);
-GEN     redrealsl2(GEN V);
-GEN     redrealsl2step(GEN A);
-
-/* alglin1.c */
-typedef long (*pivot_fun)(GEN,GEN,long,GEN);
-GEN RgM_pivots(GEN x0, GEN data, long *rr, pivot_fun pivot);
-void    vecselect_p(GEN A, GEN B, GEN p, long init, long lB);
-
-/* arith1.c */
-
-GEN     bestappr_mod(GEN x, GEN A, GEN B);
-int     is_gener_Fp(GEN x, GEN p, GEN p_1, GEN L);
-int     is_gener_Fl(ulong x, ulong p, ulong p_1, GEN L);
-
-/* arith2.c */
-
-byteptr initprimes0(ulong maxnum, long *lenp, ulong *lastp);
-long    set_optimize(long what, GEN g);
-
-/* base1.c */
-
-void    nfbasic_add_disc(nfbasic_t *T);
-void    nfbasic_init(GEN x, long flag, GEN fa, nfbasic_t *T);
-GEN     nffromhnfbasis(GEN nf, GEN x);
-GEN     nftohnfbasis(GEN nf, GEN x);
-
-/* base2.c */
-
-GEN     gen_if_principal(GEN bnf, GEN x);
-int     nfissquarefree(GEN nf, GEN x);
-GEN     nfreducemodpr_i(GEN x, GEN prh);
-GEN     polsymmodp(GEN g, GEN p);
-
-/* base3.c */
-
-void    check_nfelt(GEN x, GEN *den);
-GEN     zk_ei_mul(GEN nf, GEN x, long i);
-
-/* base4.c */
-
-void    check_listpr(GEN x);
-GEN     extideal_HNF_mul(GEN nf, GEN x, GEN y);
-GEN     factor_norm(GEN x);
-GEN     factorbackprime(GEN nf, GEN L, GEN e);
-long    val_norm(GEN x, GEN p, long *vz);
-
-/* base5.c */
-
-GEN     check_and_build_nfabs(GEN rnf);
-GEN     check_and_build_norms(GEN rnf);
-GEN     checkrnfeq(GEN x);
-
-/* bibli1.c */
-
-GEN     plindep(GEN x);
-GEN     pslq(GEN x);
-GEN     pslqL2(GEN x);
-
-/* buch1.c */
-
-GEN     form_to_ideal(GEN x);
-GEN     qfbforms(GEN D);
-
-/* buch2.c */
-
-typedef struct GRHcheck_t { double cD, cN; } GRHcheck_t;
-void    init_GRHcheck(GRHcheck_t *S, long N, long R1, double LOGD);
-int     GRHok(GRHcheck_t *S, double L, double SA, double SB);
-GEN     check_and_build_matal(GEN bnf);
-GEN     extract_full_lattice(GEN x);
-GEN     init_red_mod_units(GEN bnf, long prec);
-GEN     isprincipalarch(GEN bnf, GEN col, GEN kNx, GEN e, GEN dx, long *pe);
-GEN     red_mod_units(GEN col, GEN z);
-
-/* buch3.c */
-
-GEN     minkowski_bound(GEN D, long N, long r2, long prec);
-int     subgroup_conductor_ok(GEN H, GEN L);
-GEN     subgrouplist_cond_sub(GEN bnr, GEN C, GEN bound);
-
-/* elliptic.c */
-
-GEN     CM_CardEFp(GEN E, GEN p);
-GEN     weipell0(GEN e, long prec, long PREC);
-
-/* ellsea.c */
-
-void    pari_close_seadata(void);
-void    pari_init_seadata(void);
-
-/* es.c */
-
-const char * eng_ord(long i);
-char *  env_ok(const char *s);
-void    killallfiles(void);
-pariFILE* newfile(FILE *f, const char *name, int type);
-int     popinfile(void);
-GEN     readobj(FILE *f, int *ptc);
-pariFILE* try_pipe(const char *cmd, int flag);
-void    writeGEN(GEN x, FILE *f);
-void    writenamedGEN(GEN x, const char *s, FILE *f);
-
-/* galconj.c */
-
-GEN     galoiscosets(GEN O, GEN perm);
-long    intheadlong(GEN x, GEN mod);
-long    isomborne(GEN P, GEN den, GEN p);
-GEN     listznstarelts(long m, long p);
-GEN     matheadlong(GEN W, GEN mod);
-GEN     matrixnorm(GEN M, long prec);
-GEN     monomorphismlift(GEN P, GEN S, GEN Q, GEN p, long e);
-long    polheadlong(GEN P, long n, GEN mod);
-GEN     vandermondeinverseprep(GEN L);
-
-/* galois.c */
-
-GEN     polgaloisnamesbig(long n, long k);
-
-/* gen1.c */
-
-int     ff_poltype(GEN *x, GEN *p, GEN *pol);
-GEN     gred_frac2(GEN x1, GEN x2);
-GEN     gred_rfrac2(GEN x1, GEN x2);
-GEN     gred_rfrac_simple(GEN n, GEN d);
-GEN     mulcxI(GEN x);
-GEN     mulcxmI(GEN x);
-GEN     sqr_ser_part(GEN x, long l1, long l2);
-
-/* gen3.c */
-
-GEN     gsubst_expr(GEN pol, GEN from, GEN to);
-GEN     poltoser(GEN x, long v, long prec);
-GEN     rfractoser(GEN x, long v, long prec);
-
-/* ifactor1.c */
-
-GEN     ellfacteur(GEN n, int insist);
-long    ifac_decomp(GEN n, long hint);
-GEN     ifac_primary_factor(GEN *partial, long *exponent);
-void    ifac_realloc(GEN *partial, GEN *where, long new_lg);
-GEN     ifac_start(GEN n, long moebius, long hint);
-GEN     pollardbrent(GEN n);
-ulong   snextpr(ulong p, byteptr *d, long *rcn, long *q, long k);
-GEN     squfof(GEN n);
-
-/* prime.c */
-
-long    BPSW_psp_nosmalldiv(GEN N);
-int     Fl_MR_Jaeschke(ulong n, long k);
-int     MR_Jaeschke(GEN n, long k);
-int     uisprime_nosmalldiv(ulong n);
-
-/* init.c */
-
-void    err_recover(long numerr);
-void    pari_init_defaults(void);
-void    pari_init_stack(size_t size, size_t old);
-
-/* nffactor.c */
-
-int     nfissplit(GEN nf, GEN x);
-
-/* perm.c */
-
-long    cosets_perm_search(GEN C, GEN p);
-GEN     group_export_GAP(GEN G);
-GEN     group_export_MAGMA(GEN G);
-GEN     perm_generate(GEN S, GEN H, long o);
-long    perm_relorder(GEN p, GEN S);
-GEN     perm_to_GAP(GEN p);
-GEN     quotient_subgroup_lift(GEN C, GEN H, GEN S);
-
-/* polarit1.c */
-
-GEN     F2x_Berlekamp_ker(GEN u);
-GEN     Flx_Berlekamp_ker(GEN u, ulong p);
-GEN     FpX_Berlekamp_ker(GEN u, GEN p);
-GEN     FpX_factcantor(GEN f, GEN pp, long flag);
-GEN     FqX_Berlekamp_ker(GEN u, GEN T, GEN q, GEN p);
-GEN     FqX_rand(long d1, long v, GEN T, GEN p);
-long    FqX_split_Berlekamp(GEN *t, GEN q, GEN T, GEN p);
-GEN     Zp_appr(GEN f, GEN a);
-int     cmp_padic(GEN x, GEN y);
-GEN     factcantor0(GEN f, GEN pp, long flag);
-GEN     trivfact(void);
-
-/* polarit2.c */
-
-GEN     sylvestermatrix_i(GEN x, GEN y);
-
-/* QX_factor */
-
-GEN     DDF_roots(GEN pol, GEN polp, GEN p);
-void    factor_quad(GEN x, GEN res, long *ptcnt);
-long    logint(GEN B, GEN y, GEN *ptq);
-
-/* FpX.c */
-
-GEN     FpX_gcd_check(GEN x, GEN y, GEN p);
-
-/* polarit3.c */
-
-GEN     Flm_Frobenius_pow(GEN M, long d, GEN T, ulong p);
-GEN     FpM_Frobenius_pow(GEN M, long d, GEN T, GEN p);
-GEN     FpXYQQ_pow(GEN x, GEN n, GEN S, GEN T, GEN p);
-GEN     FpX_compositum(GEN A, GEN B, GEN p);
-GEN     FpX_direct_compositum(GEN A, GEN B, GEN p);
-ulong   ZX_ZXY_ResBound(GEN A, GEN B, GEN dB);
-GEN     ffinit_Artin_Shreier(GEN ip, long l);
-GEN     ffinit_rand(GEN p, long n);
-byteptr init_modular(ulong *p);
-GEN     polint_triv(GEN xa, GEN ya);
-
-/* random.c */
-
-void    pari_init_rand(void);
-
-/* rootpol.c */
-
-GEN     FFT(GEN x, GEN Omega);
-GEN     FFTinit(long k, long prec);
-
-/* subcyclo.c */
-
-GEN     bnr_to_znstar(GEN bnr, long *complex);
-GEN     galoiscyclo(long n, long v);
-GEN     polsubcyclo_complex_bound(pari_sp ltop, GEN V, long prec);
-GEN     polsubcyclo_complex_roots(long n, long real, long prec);
-GEN     polsubcyclo_cyclic(long n, long d, long m, long z, long g, GEN powz, GEN le);
-GEN     polsubcyclo_orbits(long n, GEN H, GEN O, GEN powz, GEN le);
-GEN     polsubcyclo_roots(long n, GEN zl);
-GEN     polsubcyclo_start(long n, long d, long o, GEN borne, long *ptr_val, long *ptr_l);
-GEN     znstar_bits(long n, GEN H);
-long    znstar_conductor(long n, GEN H);
-GEN     znstar_coset_bits(long n, GEN H, long c);
-void    znstar_coset_bits_inplace(long n, GEN H, GEN bits, long c);
-void    znstar_coset_func(long n, GEN H, void (*func) (void *, long), void *data, long c);
-GEN     znstar_cosets(long n, long phi_n, GEN H);
-GEN     znstar_elts(long n, GEN H);
-GEN     znstar_generate(long n, GEN V);
-GEN     znstar_hnf(GEN Z, GEN M);
-GEN     znstar_hnf_elts(GEN Z, GEN H);
-GEN     znstar_hnf_generators(GEN Z, GEN M);
-GEN     znstar_partial_bits(long n, GEN H, long d);
-GEN     znstar_partial_coset_bits(long n, GEN H, long d, long c);
-void    znstar_partial_coset_bits_inplace(long n, GEN H, GEN bits, long d, long c);
-void    znstar_partial_coset_func(long n, GEN H, void (*func) (void *, long), void *data, long d, long c);
-GEN     znstar_reduce_modulus(GEN H, long n);
-GEN     znstar_small(GEN zn);
-
-/* trans1.c */
-
-void    pari_init_floats(void);
-void    pari_close_floats(void);
-GEN     rootsof1complex(GEN n, long prec);
-GEN     rootsof1padic(GEN n, GEN y);
-
-/* trans2.c */
-
-GEN     cxpsi(GEN s0, long prec);
-double  darg(double s, double t);
-
-/* trans3.c */
-
-GEN     bernreal_using_zeta(long n, GEN iz, long prec);
-GEN     czeta(GEN s0, long prec);
-GEN     inv_szeta_euler(long n, double lba, long prec);
-GEN     polylogd0(long m, GEN x, long flag, long prec);
-GEN     twistpartialzeta(GEN q, long f, long c, GEN va, GEN cff);
-
-ENDEXTERN

deleted file patches/paripriv-Solaris.h.patch

@@ -1 @@
---- paripriv.h.orig     Wed Oct 14 11:08:45 2009
-+++ paripriv-Solaris.h  Wed Oct 14 12:31:52 2009
-@@ -255,8 +255,13 @@
- GEN  ZX_disc_all(GEN,ulong);
- long ZX_get_prec(GEN x);
- GEN  ZX_resultant_all(GEN A, GEN B, GEN dB, ulong bound);
-+/* 
-+Coment out the following two lines, as they cause problems on 
-+Solaris. I was originally going to do this on all platforms, not just 
-+Solaris, but I noticed there was already an altered partpriv-osx.h, 
-+so this modified version will only be copied over if using Solaris. 
- GEN  ZY_ZXY_resultant_all(GEN A, GEN B0, long *lambda, GEN *LPRS);
--GEN  ZY_ZXY_rnfequation(GEN A, GEN B0, long *lambda);
-+GEN  ZY_ZXY_rnfequation(GEN A, GEN B0, long *lambda); */
- GEN  RgXQ_u_pow(GEN x, ulong n, GEN T);
- GEN  RgX_gcd_simple(GEN x, GEN y);
- GEN  RgX_extgcd_simple(GEN a, GEN b, GEN *pu, GEN *pv);
-@@ -425,8 +430,15 @@
-   pari_timer *T;
- } gp_data;
-   /* GP_DATA->flags */
-+/* 
-+
-+Coment out the following two enum, as it causes problems on 
-+Solaris. I was originally going to do this on all platforms, not just 
-+Solaris, but I noticed there was already an altered partpriv-osx.h, 
-+so this modified version will only be copied over if using Solaris. 
- enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
-        USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512};
-+*/
- 
- extern gp_data *GP_DATA;
- 

deleted file patches/paripriv-osx.h

@@ -1 @@
-/* $Id: paripriv.h,v 1.60 2005/07/21 00:18:31 kb Exp $
-
-Copyright (C) 2004  The PARI group.
-
-This file is part of the PARI/GP package.
-
-PARI/GP 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. It is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY WHATSOEVER.
-
-Check the License for details. You should have received a copy of it, along
-with the package; see the file 'COPYING'. If not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* for qsort */
-typedef int (*QSCOMP)(const void *, const void *);
-
-/* swap */
-#define lswap(x,y) {long _z=x; x=y; y=_z;}
-#define pswap(x,y) {GEN *_z=x; x=y; y=_z;}
-#define swap(x,y)  {GEN  _z=x; x=y; y=_z;}
-#define dswap(x,y) { double _t=x; x=y; y=_t; }
-#define pdswap(x,y) { double* _t=x; x=y; y=_t; }
-#define swapspec(x,y, nx,ny) {swap(x,y); lswap(nx,ny);}
-
-/* */
-#define both_odd(x,y) ((x)&(y)&1)
-
-/* generic */
-GEN arith_proto(long f(GEN), GEN x, int do_error);
-GEN arith_proto2(long f(GEN,GEN), GEN x, GEN n);
-GEN arith_proto2gs(long f(GEN,long), GEN x, long y);
-GEN gassoc_proto(GEN f(GEN,GEN),GEN,GEN);
-GEN garith_proto(GEN f(GEN), GEN x, int do_error);
-GEN garith_proto2gs(GEN f(GEN,long), GEN x, long y);
-GEN trans_fix_arg(long *prec, GEN *s0, GEN *sig, pari_sp *av, GEN *res);
-GEN transc(GEN (*f) (GEN, long), GEN x, long prec);
-
-/* loops */
-GEN incloop(GEN a);
-GEN incpos(GEN a);
-GEN resetloop(GEN a, GEN b);
-GEN setloop(GEN a);
-
-/* multiprecision */
-GEN   addrex01(GEN x);
-GEN   addumului(ulong a, ulong b, GEN Y);
-void  affr_fixlg(GEN z, GEN y);
-GEN   cxnorm(GEN x);
-GEN   quadnorm(GEN x);
-GEN   divgsns(GEN x, long i);
-GEN   divrsns(GEN x, long i);
-GEN   init_remiimul(GEN M);
-ulong invrev(ulong b);
-GEN   ishiftr_lg(GEN x, long lx, long n);
-GEN   logagmcx(GEN q, long prec);
-GEN   muliispec(GEN x, GEN y, long nx, long ny);
-GEN   padic_to_Fp(GEN x, GEN Y);
-ulong padic_to_Fl(GEN x, ulong p);
-GEN   red_montgomery(GEN T, GEN N, ulong inv);
-GEN   remiimul(GEN x, GEN sy);
-GEN   sqrispec(GEN x, long nx);
-GEN   subrex01(GEN x);
-GEN   mulcxI(GEN x);
-GEN   mulcxmI(GEN x);
-
-int approx_0(GEN x, GEN y);
-GEN bernfrac_using_zeta(long n);
-int OK_bern(long nb, long prec);
-GEN padic_sqrtn(GEN x, GEN n, GEN *zetan);
-
-/* FIXME: adapt/use mpn_[lr]shift instead */
-#define shift_left(z2,z1,imin,imax,f, sh) {\
-  register const ulong _m = BITS_IN_LONG - (sh);\
-  shift_left2((z2),(z1),(imin),(imax),(f),(sh),(_m)); }
-
-#define shift_right(z2,z1,imin,imax,f, sh) {\
-  register const ulong _m = BITS_IN_LONG - (sh);\
-  shift_right2((z2),(z1),(imin),(imax),(f),(sh),(_m)); }
-
-/* powers */
-#define sqrs(b) mulss((b),(b))
-#define sqru(b) muluu((b),(b))
-GEN    rpowuu(ulong a, ulong n, long prec);
-GEN    powrshalf(GEN x, long s);
-GEN    powrfrac(GEN x, long n, long d);
-ulong  u_pow10(int n);
-
-/* floats */
-double dabs(double s, double t);
-long   dblexpo(double x);
-ulong  dblmantissa(double x);
-void   dcxlog(double s, double t, double *a, double *b);
-double dnorm(double s, double t);
-double mylog2(GEN z);
-ulong  usqrtsafe(ulong a);
-
-/* "abs" routines for t_REAL ( disregard sign ) */
-int absrnz_egal1(GEN x);
-int absrnz_egal2n(GEN x);
-GEN exp1r_abs(GEN x);
-GEN logagmr_abs(GEN q);
-GEN logr_abs(GEN x);
-GEN sqrtr_abs(GEN x);
-
-/* hnf */
-GEN gauss_triangle_i(GEN A, GEN B,GEN t);
-GEN hnfadd(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
-GEN hnfadd_i(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
-GEN hnfall_i(GEN A, GEN *ptB, long remove);
-GEN hnf_gauss(GEN A, GEN B);
-GEN hnf_invimage(GEN A, GEN b);
-GEN hnfmerge_get_1(GEN A, GEN B);
-GEN hnfperm_i(GEN A, GEN *ptU, GEN *ptperm);
-GEN hnfspec_i(long** m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
-GEN hnfspec(long** m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
-GEN idealhermite_aux(GEN nf, GEN x);
-GEN mathnfspec(GEN x, GEN *ptperm, GEN *ptdep, GEN *ptB, GEN *ptC);
-
-/* LLL */
-GEN lllint_fp_ip(GEN x, long D);
-GEN lllfp_marked(long *M, GEN x, long D, long flag, long prec, int gram);
-GEN lllint_marked(long *M, GEN x, long D, int g, GEN *h, GEN *f, GEN *B);
-GEN LLL_check_progress(GEN Bnorm, long n0, GEN m, int final, long *ti_LLL);
-GEN extendedgcd(GEN A);
-
-/* miscellaneous linear algebra */
-GEN  diagonal_i(GEN x);
-GEN  F2V_red_ip(GEN v);
-GEN  gauss_realimag(GEN x, GEN y);
-GEN  imagecomplspec(GEN x, long *nlze);
-GEN  matqpascal(long n, GEN q);
-GEN  R_from_QR(GEN x, long prec);
-void rowselect_p(GEN A, GEN B, GEN p, long init);
-GEN  split_realimag(GEN x, long r1, long r2);
-GEN  sqred1_from_QR(GEN x, long prec);
-GEN  supnorm(GEN L, long prec);
-GEN  znstar_hnf_elts(GEN Z, GEN H);
-GEN  ZV_lincomb(GEN u, GEN v, GEN X, GEN Y);
-GEN  vec_setconst(GEN v, GEN x);
-GEN  vec_const(long n, GEN x);
-GEN  col_const(long n, GEN x);
-  
-GEN  GS_norms(GEN B, long prec);
-GEN  dim1proj(GEN prh);
-GEN  detcyc(GEN cyc, long *L);
-GEN  close_modinvertible(GEN x, GEN y);
-GEN  colreducemodHNF(GEN x, GEN y, GEN *Q);
-GEN  col_to_ff(GEN x, long v);
-
-/* famat */
-GEN factorback_i(GEN fa, GEN e, GEN nf, int red);
-GEN factorbackprime(GEN nf, GEN L, GEN e);
-GEN famat_inv(GEN f);
-GEN famat_makecoprime(GEN nf, GEN g, GEN e, GEN pr, GEN prk, GEN EX);
-GEN famat_mul(GEN f, GEN g);
-GEN famat_mul(GEN f, GEN g);
-GEN famat_pow(GEN f, GEN n);
-GEN famat_reduce(GEN fa);
-GEN famat_to_arch(GEN nf, GEN fa, long prec);
-GEN famat_to_nf_modideal_coprime(GEN nf, GEN g, GEN e, GEN id, GEN EX);
-GEN famat_to_nf_modidele(GEN nf, GEN g, GEN e, GEN bid);
-GEN famat_to_nf_modidele(GEN nf, GEN g, GEN e, GEN bid);
-GEN merge_factor_i(GEN f, GEN g);
-GEN to_famat_all(GEN x, GEN y);
-GEN to_famat(GEN g, GEN e);
-GEN trivfact(void);
-GEN vconcat(GEN Q1, GEN Q2);
-
-/* integer factorization / discrete log */
-int   BSW_isprime(GEN x);
-int   BSW_isprime_small(GEN x);
-GEN   coprime_part(GEN x, GEN f);
-GEN   decomp_limit(GEN n, GEN limit);
-GEN   Fp_PHlog(GEN a, GEN g, GEN p, GEN ord);
-GEN   Fp_shanks(GEN x,GEN g0,GEN p, GEN q);
-ulong is_kth_power(GEN x, ulong p, GEN *pt, byteptr d);
-long  ifac_decomp_break(GEN n, long (*B)(GEN,GEN,GEN,GEN), GEN s, long hint);
-int   miller(GEN n, long k);
-GEN   mpqs(GEN N);
-ulong ucarrecomplet(ulong A);
-ulong ugcd(ulong x, ulong y);
-long  Z_lvalrem_stop(GEN n, ulong p, int *stop);
-long  Z_issquarefree(GEN x);
-
-/* quadratic forms, quadratic numbers */
-long cornacchia(GEN d, GEN p, GEN *px, GEN *py);
-long cornacchia2(GEN d, GEN p, GEN *px, GEN *py);
-GEN  primeform_u(GEN x, ulong p);
-GEN  qf_disc(GEN x);
-void qfb_comp(GEN z,GEN x,GEN y);
-GEN  qfr_to_qfr5(GEN x, long prec);
-GEN  qfr3_comp(GEN x, GEN y, GEN D, GEN isqrtD);
-GEN  qfr3_pow(GEN x, GEN n, GEN D, GEN isqrtD);
-GEN  qfr3_red(GEN x, GEN D, GEN isqrtD);
-GEN  qfr3_rho(GEN x, GEN D, GEN isqrtD);
-GEN  qfr3_to_qfr(GEN x, GEN z);
-GEN  qfr5_dist(GEN e, GEN d, long prec);
-GEN  qfr5_comp(GEN x, GEN y, GEN D, GEN sqrtD, GEN isqrtD);
-GEN  qfr5_pow(GEN x, GEN n, GEN D, GEN sqrtD, GEN isqrtD);
-GEN  qfr5_red(GEN x, GEN D, GEN sqrtD, GEN isqrtD);
-GEN  qfr5_rho(GEN x, GEN D, GEN sqrtD, GEN isqrtD);
-GEN  qfr_pow(GEN x, GEN n);
-GEN  qfr_unit(GEN x);
-GEN  qfi_unit(GEN x);
-GEN  quad_polmod_conj(GEN x, GEN y);
-GEN  quad_polmod_norm(GEN x, GEN y);
-
-/* Polynomials */
-/* a) Arithmetic/conversions */
-GEN  addmulXn(GEN x, GEN y, long d);
-GEN  addshiftpol(GEN x, GEN y, long d);
-GEN  fix_rfrac_if_pol(GEN x, GEN y);
-GEN  gmulXn(GEN x, long d);
-GEN  lift_if_rational(GEN x);
-GEN  monomial(GEN a, int degpol, int v);
-GEN  mulmat_pol(GEN A, GEN x);
-long polegal_spec(GEN x, GEN y);
-GEN  polrecip_i(GEN x);
-GEN  pol_to_monic(GEN pol, GEN *lead);
-GEN  revpol(GEN x);
-GEN  ser_to_pol_i(GEN x, long lx);
-GEN  shiftpol_i(GEN x, long v);
-GEN  swap_vars(GEN b0, long v);
-GEN  to_polmod(GEN x, GEN mod);
-GEN  TR_pol(GEN P, GEN c);
-
-/* b) Modular */
-GEN  bezout_lift_fact(GEN T, GEN Tmod, GEN p, long e);
-GEN  caractducos(GEN p, GEN x, int v);
-GEN  FpXQX_from_Kronecker(GEN z, GEN pol, GEN p);
-GEN  FpX_quad_root(GEN x, GEN p, int unknown);
-long FpX_split_Berlekamp(GEN *t, GEN pp);
-long FqX_is_squarefree(GEN P, GEN T, GEN p);
-GEN  FqX_split_all(GEN z, GEN T, GEN p);
-long FqX_split_by_degree(GEN *pz, GEN u, GEN q, GEN T, GEN p);
-long FqX_split_deg1(GEN *pz, GEN u, GEN q, GEN T, GEN p);
-GEN  FqX_split_roots(GEN z, GEN T, GEN p, GEN pol);
-GEN  nfgcd(GEN P, GEN Q, GEN nf, GEN den);
-GEN  polratlift(GEN P, GEN mod, GEN amax, GEN bmax, GEN denom);
-GEN  polsym_gen(GEN P, GEN y0, long n, GEN T, GEN N);
-GEN  ZX_caract_sqf(GEN A, GEN B, long *lambda, long v);
-GEN  ZX_disc_all(GEN,ulong);
-long ZX_get_prec(GEN x);
-GEN  ZX_resultant_all(GEN A, GEN B, GEN dB, ulong bound);
-/* GEN  ZY_ZXY_resultant_all(GEN A, GEN B0, long *lambda, GEN *LPRS);
-GEN  ZY_ZXY_resultant(GEN A, GEN B0, long *lambda);
-*/
-GEN  RgXQ_u_pow(GEN x, ulong n, GEN T);
-GEN  RgX_gcd_simple(GEN x, GEN y);
-GEN  RgX_extgcd_simple(GEN a, GEN b, GEN *pu, GEN *pv);
-
-/* b') Chinese Remainder Theorem */
-GEN ZM_init_CRT(GEN Hp, ulong p);
-int ZM_incremental_CRT(GEN H, GEN Hp, GEN q, GEN qp, ulong p);
-
-/* c) factorization */
-double cauchy_bound(GEN p);
-GEN chk_factors_get(GEN lt, GEN famod, GEN c, GEN T, GEN N);
-int cmbf_precs(GEN q, GEN A, GEN B, long *a, long *b, GEN *qa, GEN *qb);
-GEN ZX_DDF(GEN x, long hint);
-GEN fact_from_DDF(GEN fa, GEN e, long n);
-GEN initgaloisborne(GEN T, GEN dn, long prec, GEN *pL, GEN *pprep, GEN *pdis);
-GEN logmax_modulus_bound(GEN p);
-GEN polint_i(GEN xa, GEN ya, GEN x, long n, GEN *ptdy);
-GEN quicktrace(GEN x, GEN sym);
-GEN roots_to_pol_intern(GEN L, GEN a, long v, int plus);
-GEN roots_to_pol_r1r2(GEN a, long r1, long v);
-GEN special_pivot(GEN x);
-GEN vandermondeinverse(GEN L, GEN T, GEN den, GEN prep);
-GEN vandermondeinversemod(GEN L, GEN T, GEN den, GEN mod);
-GEN ZX_squff(GEN f, GEN *ex);
-GEN ZX_monic_factorpadic(GEN f, GEN p, long prec);
-
-/* Number fields */
-GEN    arch_mul(GEN x, GEN y);
-GEN    archstar_full_rk(GEN x, GEN bas, GEN v, GEN gen);
-GEN    bnrGetSurj(GEN bnr1, GEN bnr2);
-GEN    check_and_build_cycgen(GEN bnf);
-double check_bach(double cbach, double B);
-GEN    _checkbnf(GEN bnf);
-GEN    _checknf(GEN nf);
-void   check_ZKmodule(GEN x, char *s);
-void   dbg_rel(long s, GEN col);
-GEN    element_mulidid(GEN nf, long i, long j);
-GEN    element_powid_mod_p(GEN nf, long I, GEN n, GEN p);
-GEN    eltabstorel(GEN x, GEN T, GEN pol, GEN k);
-GEN    eltmulid_get_table(GEN nf, long i);
-GEN    eltreltoabs(GEN rnfeq, GEN x);
-GEN    galoisbig(GEN x, long prec);
-GEN    get_arch(GEN nf,GEN x,long prec);
-GEN    get_arch_real(GEN nf,GEN x,GEN *emb,long prec);
-GEN    get_bas_den(GEN bas);
-GEN    get_hnfid(GEN nf, GEN x);
-GEN    get_mul_table(GEN x,GEN bas,GEN invbas);
-GEN    get_nfindex(GEN bas);
-GEN    get_proj_modT(GEN basis, GEN T, GEN p);
-GEN    get_roots(GEN x,long r1,long prec);
-GEN    get_theta_abstorel(GEN T, GEN pol, GEN k);
-GEN    idealaddtoone_i(GEN nf, GEN x, GEN y);
-GEN    idealcoprime_fact(GEN nf, GEN x, GEN fy);
-GEN    idealhermite_aux(GEN nf, GEN x);
-GEN    idealsqrtn(GEN nf, GEN x, GEN gn, int strict);
-GEN    init_unif_mod_fZ(GEN L);
-GEN    init_units(GEN BNF);
-long   int_elt_val(GEN nf, GEN x, GEN p, GEN bp, GEN *t);
-GEN    isprincipalfact(GEN bnf,GEN P, GEN e, GEN C, long flag);
-GEN    make_integral(GEN nf, GEN L0, GEN f, GEN *listpr);
-GEN    maxord_i(GEN p, GEN f, long mf, GEN w, long flag);
-GEN    modprM(GEN z, GEN nf,GEN modpr);
-GEN    modprV(GEN z, GEN nf,GEN modpr);
-GEN    modprX(GEN x, GEN nf,GEN modpr);
-GEN    nfpol_to_Flx(GEN nf, GEN pol, ulong *ptp);
-GEN    nfreducemodideal_i(GEN x0,GEN ideal);
-GEN    nfrootsall_and_pr(GEN nf, GEN pol);
-GEN    norm_by_embed(long r1, GEN x);
-GEN    perm_to_arch(GEN nf, GEN archp);
-GEN    pidealprimeinv(GEN nf, GEN x);
-GEN    primedec_apply_kummer(GEN nf,GEN pol,long e,GEN p);
-GEN    prodid(GEN nf, GEN I);
-GEN    pr_norm(GEN pr);
-GEN    quadhilbertreal(GEN D, long prec);
-GEN    rnfallbase(GEN nf, GEN pol, GEN *pD, GEN *pd, GEN *pfi);
-GEN    _rnfequation(GEN A, GEN B, long *pk, GEN *pLPRS);
-GEN    special_anti_uniformizer(GEN nf, GEN pr);
-GEN    sqr_by_tab(GEN tab, GEN x);
-GEN    subgroupcondlist(GEN cyc, GEN bound, GEN listKer);
-GEN    T2_from_embed_norm(GEN x, long r1);
-void   testprimes(GEN bnf, ulong bound);
-GEN    to_Fp_simple(GEN nf, GEN x, GEN ffproj);
-GEN    unif_mod_fZ(GEN pr, GEN F);
-GEN    unnf_minus_x(GEN x);
-void   wr_rel(GEN col);
-GEN    zideallog_sgn(GEN nf, GEN x, GEN sgn, GEN bid);
-GEN    zlog_units(GEN nf, GEN U, GEN sgnU, GEN bid);
-GEN    zlog_units_noarch(GEN nf, GEN U, GEN bid);
-GEN    zsign_from_logarch(GEN Larch, GEN invpi, GEN archp);
-
-/* Dedekind zeta */
-GEN  zeta_get_limx(long r1, long r2, long bit);
-long zeta_get_i0(long r1, long r2, long bit, GEN limx);
-long zeta_get_N0(GEN C,  GEN limx);
-
-
-/* Allocation / gerepile */
-void   init_dalloc();
-double *dalloc(size_t n);
-void   gerepilecoeffs2(pari_sp av, GEN x, int n, GEN y, int o);
-void   minim_alloc(long n, double ***q, GEN *x, double **y,  double **z, double **v);
-int    pop_entree_bloc(entree *ep, long loc);
-int    pop_val_if_newer(entree *ep, long loc);
-
-/* Interfaces (GP, etc.) */
-void  errcontext(char *msg, char *s, char *entry);
-void  free_graph(void);
-GEN   geni(void);
-void* get_stack(double,int);
-GEN   gpreadseq(char *c, int strict);
-void  init_defaults(int force);
-void  init_graph(void);
-void  initout(int initerr);
-char* itostr(GEN x, int minus);
-void  kill_from_hashlist(entree *ep, long n);
-void  member_err(char *s);
-int   pari_kernel_init(void);
-void  pari_sig_init(void (*f)(int));
-void  print_functions_hash(const char *s);
-void  print_fun_list(char **matches, int nbli);
-void  print_user_fun(entree *ep);
-void  print_user_member(entree *ep);
-void  print_all_user_fun(void);
-void  print_all_user_member(void);
-int   term_width(void);
-void  texmacs_completion(char *s, long pos);
-void  var_make_safe();
-int   whatnow(char *s, int flag);
-void  whatnow_new_syntax(char *f, long n);
-
-/* defaults */
-#define is_default(s) setdefault((s),"",d_EXISTS) == gen_1
-enum { d_SILENT, d_ACKNOWLEDGE, d_INITRC, d_RETURN, d_EXISTS };
-extern ulong prec;
-
-GEN sd_TeXstyle(const char *v, int flag);
-GEN sd_colors(char *v, int flag);
-GEN sd_compatible(const char *v, int flag);
-GEN sd_datadir(char *v, int flag);
-GEN sd_debug(const char *v, int flag);
-GEN sd_debugfiles(const char *v, int flag);
-GEN sd_debugmem(const char *v, int flag);
-GEN sd_echo(const char *v, int flag);
-GEN sd_factor_add_primes(char *v, int flag);
-GEN sd_filename(const char *v, int flag, char *s, char **f);
-GEN sd_format(const char *v, int flag);
-GEN sd_help(char *v, int flag);
-GEN sd_histsize(const char *v, int flag);
-GEN sd_lines(const char *v, int flag);
-GEN sd_log(const char *v, int flag);
-GEN sd_logfile(const char *v, int flag);
-GEN sd_new_galois_format(char *v, int flag);
-GEN sd_output(const char *v, int flag);
-GEN sd_parisize(const char *v, int flag);
-GEN sd_path(char *v, int flag);
-GEN sd_prettyprinter(char *v, int flag);
-GEN sd_primelimit(const char *v, int flag);
-GEN sd_prompt(const char *v, int flag);
-GEN sd_prompt_cont(const char *v, int flag);
-GEN sd_psfile(const char *v, int flag);
-GEN sd_realprecision(const char *v, int flag);
-GEN sd_rl(const char *v, int flag);
-GEN sd_secure(const char *v, int flag);
-GEN sd_seriesprecision(const char *v, int flag);
-GEN sd_simplify(const char *v, int flag);
-GEN sd_strictmatch(const char *v, int flag);
-GEN sd_timer(const char *v, int flag);
-GEN setdefault(const char *s, const char *v, int flag);
-
-/* history */
-typedef struct {
-  GEN *res;    /* array of previous results, FIFO */
-  size_t size; /* # res */
-  ulong total; /* # of results computed since big bang */
-} gp_hist;
-
-/* prettyprinter */
-typedef struct {
-  pariFILE *file;
-  char *cmd;
-} gp_pp;
-
-/* path */
-typedef struct {
-  char *PATH;
-  char **dirs;
-} gp_path;
-
-/* for output */
-typedef struct {
-  char format; /* e,f,g */
-  long fieldw; /* 0 (ignored) or field width */
-  long sigd;   /* -1 (all) or number of significant digits printed */
-  int sp;      /* 0 = suppress whitespace from output */
-  int prettyp; /* output style: raw, prettyprint, etc */
-  int TeXstyle;
-} pariout_t;
-
-char *GENtostr0(GEN x, pariout_t *T, void (*do_out)(GEN, pariout_t*));
-void lim_lines_output(GEN z, pariout_t *fmt, long n, long max);
-void gen_output(GEN x, pariout_t *T);
-
-/* GP_DATA */
-typedef struct {
-  ulong primelimit;
-  jmp_buf env;
-  gp_hist *hist;
-  gp_pp *pp;
-  gp_path *path;
-  pariout_t *fmt;
-  ulong flags, lim_lines;
-  char *help, *prompt, *prompt_cont;
-  pari_timer *T;
-} gp_data;
-  /* GP_DATA->flags */
-/* enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
-       USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512};
-*/
-
-extern gp_data *GP_DATA;
-
-typedef struct Buffer {
-  char *buf;
-  ulong len;
-  jmp_buf env;
-} Buffer;
-Buffer *new_buffer(void);
-void delete_buffer(Buffer *b);
-void fix_buffer(Buffer *b, long newlbuf);
-
-typedef struct {
-  char *s, *t, *end; /* source, target, last char read */
-  int in_string, in_comment, more_input, wait_for_brace, downcase;
-  Buffer *buf;
-} filtre_t;
-void init_filtre(filtre_t *F, Buffer *buf);
-char *filtre(char *s, int flag);
-void check_filtre(filtre_t *F);
-
-gp_data *default_gp_data(void);
-char *color_prompt(char *prompt);
-GEN  gp_history(gp_hist *H, long p, char *old, char *entry);
-GEN  set_hist_entry(gp_hist *H, GEN x);
-
-void delete_dirs(gp_path *p);
-void gp_expand_path(gp_path *p);
-const char *pari_default_path();
-char *expand_prompt(char *prompt, filtre_t *F);
-
-typedef struct input_method {
-/* mandatory */
-  char * (*fgets)(char *,int,FILE*);
-  char * (*getline)(char**, int f, struct input_method*, filtre_t *F);
-  int free; /* boolean: must we free the output of getline() ? */
-/* for interactive methods */
-  char *prompt, *prompt_cont;
-/* for non-interactive methods */
-  FILE *file;
-} input_method;
-
-int input_loop(filtre_t *F, input_method *IM);
-char *file_input(char **s0, int junk, input_method *IM, filtre_t *F);

deleted file patches/paripriv-osx.patch

@@ -1 @@
---- ../src/src/headers/paripriv.h       2007-03-29 01:58:00.000000000 -0700
-+++ paripriv-osx.h      2007-12-26 21:35:54.000000000 -0800
-@@ -1,4 +1,4 @@
--/* $Id: paripriv.h,v 1.106.2.2 2007/03/29 08:58:00 kb Exp $
-+/* $Id: paripriv.h,v 1.60 2005/07/21 00:18:31 kb Exp $
- 
- Copyright (C) 2004  The PARI group.
- 
-@@ -13,8 +13,6 @@
- with the package; see the file 'COPYING'. If not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
- 
--BEGINEXTERN
--
- /* for qsort */
- typedef int (*QSCOMP)(const void *, const void *);
- 
-@@ -29,11 +27,6 @@
- /* */
- #define both_odd(x,y) ((x)&(y)&1)
- 
--/* unused */
--GEN ellheightoo(GEN e, GEN z, long prec);
--void ellprint(GEN e);
--GEN mpinv(GEN b);
--
- /* generic */
- GEN arith_proto(long f(GEN), GEN x, int do_error);
- GEN arith_proto2(long f(GEN,GEN), GEN x, GEN n);
-@@ -43,30 +36,23 @@
- GEN garith_proto2gs(GEN f(GEN,long), GEN x, long y);
- GEN trans_fix_arg(long *prec, GEN *s0, GEN *sig, pari_sp *av, GEN *res);
- GEN transc(GEN (*f) (GEN, long), GEN x, long prec);
--GEN sort_factor(GEN y, int (*cmp)(GEN,GEN));
--GEN sort_factor_gen(GEN y, int (*cmp)(GEN,GEN));
--GEN sort_factor_gen_aux(GEN y, void *data, int (*cmp)(void *,GEN,GEN));
--GEN sort_vecpol(GEN a, int (*cmp)(GEN,GEN));
- 
- /* loops */
- GEN incloop(GEN a);
-+GEN incpos(GEN a);
- GEN resetloop(GEN a, GEN b);
- GEN setloop(GEN a);
- 
- /* multiprecision */
--GEN   icopy_spec(GEN x, long nx);
- GEN   addrex01(GEN x);
- GEN   addumului(ulong a, ulong b, GEN Y);
- void  affr_fixlg(GEN z, GEN y);
- GEN   cxnorm(GEN x);
--int   lgcdii(ulong* d, ulong* d1, ulong* u, ulong* u1, ulong* v, ulong* v1, ulong vmax);
--ulong rgcduu(ulong d, ulong d1, ulong vmax, ulong* u, ulong* u1, ulong* v, ulong* v1, long *s);
--ulong xgcduu(ulong d, ulong d1, int f, ulong* v, ulong* v1, long *s);
- GEN   quadnorm(GEN x);
--ulong xxgcduu(ulong d, ulong d1, int f, ulong* u, ulong* u1, ulong* v, ulong* v1, long *s);
- GEN   divgsns(GEN x, long i);
- GEN   divrsns(GEN x, long i);
- GEN   init_remiimul(GEN M);
-+ulong invrev(ulong b);
- GEN   ishiftr_lg(GEN x, long lx, long n);
- GEN   logagmcx(GEN q, long prec);
- GEN   muliispec(GEN x, GEN y, long nx, long ny);
-@@ -82,6 +68,7 @@
- int approx_0(GEN x, GEN y);
- GEN bernfrac_using_zeta(long n);
- int OK_bern(long nb, long prec);
-+GEN padic_sqrtn(GEN x, GEN n, GEN *zetan);
- 
- /* FIXME: adapt/use mpn_[lr]shift instead */
- #define shift_left(z2,z1,imin,imax,f, sh) {\
-@@ -106,7 +93,7 @@
- ulong  dblmantissa(double x);
- void   dcxlog(double s, double t, double *a, double *b);
- double dnorm(double s, double t);
--double dbllog2(GEN z);
-+double mylog2(GEN z);
- ulong  usqrtsafe(ulong a);
- 
- /* "abs" routines for t_REAL ( disregard sign ) */
-@@ -121,12 +108,14 @@
- GEN gauss_triangle_i(GEN A, GEN B,GEN t);
- GEN hnfadd(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
- GEN hnfadd_i(GEN m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,GEN extramat,GEN extraC);
-+GEN hnfall_i(GEN A, GEN *ptB, long remove);
- GEN hnf_gauss(GEN A, GEN B);
- GEN hnf_invimage(GEN A, GEN b);
- GEN hnfmerge_get_1(GEN A, GEN B);
- GEN hnfperm_i(GEN A, GEN *ptU, GEN *ptperm);
- GEN hnfspec_i(long** m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
- GEN hnfspec(long** m,GEN p,GEN* ptdep,GEN* ptA,GEN* ptC,long k0);
-+GEN idealhermite_aux(GEN nf, GEN x);
- GEN mathnfspec(GEN x, GEN *ptperm, GEN *ptdep, GEN *ptB, GEN *ptC);
- 
- /* LLL */
-@@ -135,15 +124,13 @@
- GEN lllint_marked(long *M, GEN x, long D, int g, GEN *h, GEN *f, GEN *B);
- GEN LLL_check_progress(GEN Bnorm, long n0, GEN m, int final, long *ti_LLL);
- GEN extendedgcd(GEN A);
--GEN sqred1intern(GEN a);
--GEN lllgramintern(GEN x, long alpha, long flag, long prec);
--GEN lllintern(GEN x, long D, long flag, long prec);
- 
- /* miscellaneous linear algebra */
- GEN  diagonal_i(GEN x);
- GEN  F2V_red_ip(GEN v);
- GEN  gauss_realimag(GEN x, GEN y);
- GEN  imagecomplspec(GEN x, long *nlze);
-+GEN  matqpascal(long n, GEN q);
- GEN  R_from_QR(GEN x, long prec);
- void rowselect_p(GEN A, GEN B, GEN p, long init);
- GEN  split_realimag(GEN x, long r1, long r2);
-@@ -152,6 +139,8 @@
- GEN  znstar_hnf_elts(GEN Z, GEN H);
- GEN  ZV_lincomb(GEN u, GEN v, GEN X, GEN Y);
- GEN  vec_setconst(GEN v, GEN x);
-+GEN  vec_const(long n, GEN x);
-+GEN  col_const(long n, GEN x);
-   
- GEN  GS_norms(GEN B, long prec);
- GEN  dim1proj(GEN prh);
-@@ -166,37 +155,34 @@
- GEN famat_inv(GEN f);
- GEN famat_makecoprime(GEN nf, GEN g, GEN e, GEN pr, GEN prk, GEN EX);
- GEN famat_mul(GEN f, GEN g);
-+GEN famat_mul(GEN f, GEN g);
- GEN famat_pow(GEN f, GEN n);
- GEN famat_reduce(GEN fa);
- GEN famat_to_arch(GEN nf, GEN fa, long prec);
- GEN famat_to_nf_modideal_coprime(GEN nf, GEN g, GEN e, GEN id, GEN EX);
- GEN famat_to_nf_modidele(GEN nf, GEN g, GEN e, GEN bid);
-+GEN famat_to_nf_modidele(GEN nf, GEN g, GEN e, GEN bid);
- GEN merge_factor_i(GEN f, GEN g);
- GEN to_famat_all(GEN x, GEN y);
- GEN to_famat(GEN g, GEN e);
- GEN trivfact(void);
-+GEN vconcat(GEN Q1, GEN Q2);
- 
- /* integer factorization / discrete log */
- int   BSW_isprime(GEN x);
- int   BSW_isprime_small(GEN x);
- GEN   coprime_part(GEN x, GEN f);
--GEN   Z_factor_limit(GEN n, GEN limit);
-+GEN   decomp_limit(GEN n, GEN limit);
- GEN   Fp_PHlog(GEN a, GEN g, GEN p, GEN ord);
- GEN   Fp_shanks(GEN x,GEN g0,GEN p, GEN q);
- ulong is_kth_power(GEN x, ulong p, GEN *pt, byteptr d);
- long  ifac_decomp_break(GEN n, long (*B)(GEN,GEN,GEN,GEN), GEN s, long hint);
--long  ifac_moebius(GEN n, long hint);
--long  ifac_issquarefree(GEN n, long hint);
--long  ifac_omega(GEN n, long hint);
--long  ifac_bigomega(GEN n, long hint);
--GEN   ifac_totient(GEN n, long hint);
--GEN   ifac_numdiv(GEN n, long hint);
--GEN   ifac_sumdiv(GEN n, long hint);
--GEN   ifac_sumdivk(GEN n, long k, long hint);
- int   miller(GEN n, long k);
- GEN   mpqs(GEN N);
-+ulong ucarrecomplet(ulong A);
- ulong ugcd(ulong x, ulong y);
- long  Z_lvalrem_stop(GEN n, ulong p, int *stop);
-+long  Z_issquarefree(GEN x);
- 
- /* quadratic forms, quadratic numbers */
- long cornacchia(GEN d, GEN p, GEN *px, GEN *py);
-@@ -225,44 +211,45 @@
- /* a) Arithmetic/conversions */
- GEN  addmulXn(GEN x, GEN y, long d);
- GEN  addshiftpol(GEN x, GEN y, long d);
-+GEN  fix_rfrac_if_pol(GEN x, GEN y);
-+GEN  gmulXn(GEN x, long d);
- GEN  lift_if_rational(GEN x);
--GEN  monomial(GEN a, long degpol, long v);
--GEN  monomialcopy(GEN a, long degpol, long v);
-+GEN  monomial(GEN a, int degpol, int v);
- GEN  mulmat_pol(GEN A, GEN x);
- long polegal_spec(GEN x, GEN y);
- GEN  polrecip_i(GEN x);
- GEN  pol_to_monic(GEN pol, GEN *lead);
- GEN  revpol(GEN x);
--GEN  ser2pol_i(GEN x, long lx);
--GEN  ser2rfrac_i(GEN x);
-+GEN  ser_to_pol_i(GEN x, long lx);
- GEN  shiftpol_i(GEN x, long v);
- GEN  swap_vars(GEN b0, long v);
--GEN  translate_pol(GEN P, GEN c);
-+GEN  to_polmod(GEN x, GEN mod);
-+GEN  TR_pol(GEN P, GEN c);
- 
- /* b) Modular */
- GEN  bezout_lift_fact(GEN T, GEN Tmod, GEN p, long e);
--GEN  caractducos(GEN p, GEN x, long v);
-+GEN  caractducos(GEN p, GEN x, int v);
- GEN  FpXQX_from_Kronecker(GEN z, GEN pol, GEN p);
- GEN  FpX_quad_root(GEN x, GEN p, int unknown);
- long FpX_split_Berlekamp(GEN *t, GEN pp);
-+long FqX_is_squarefree(GEN P, GEN T, GEN p);
- GEN  FqX_split_all(GEN z, GEN T, GEN p);
- long FqX_split_by_degree(GEN *pz, GEN u, GEN q, GEN T, GEN p);
- long FqX_split_deg1(GEN *pz, GEN u, GEN q, GEN T, GEN p);
- GEN  FqX_split_roots(GEN z, GEN T, GEN p, GEN pol);
-+GEN  nfgcd(GEN P, GEN Q, GEN nf, GEN den);
- GEN  polratlift(GEN P, GEN mod, GEN amax, GEN bmax, GEN denom);
- GEN  polsym_gen(GEN P, GEN y0, long n, GEN T, GEN N);
- GEN  ZX_caract_sqf(GEN A, GEN B, long *lambda, long v);
- GEN  ZX_disc_all(GEN,ulong);
- long ZX_get_prec(GEN x);
- GEN  ZX_resultant_all(GEN A, GEN B, GEN dB, ulong bound);
--GEN  ZY_ZXY_resultant_all(GEN A, GEN B0, long *lambda, GEN *LPRS);
--GEN  ZY_ZXY_rnfequation(GEN A, GEN B0, long *lambda);
-+/* GEN  ZY_ZXY_resultant_all(GEN A, GEN B0, long *lambda, GEN *LPRS);
-+GEN  ZY_ZXY_resultant(GEN A, GEN B0, long *lambda);
-+*/
- GEN  RgXQ_u_pow(GEN x, ulong n, GEN T);
- GEN  RgX_gcd_simple(GEN x, GEN y);
- GEN  RgX_extgcd_simple(GEN a, GEN b, GEN *pu, GEN *pv);
--GEN  RgXQ_minpoly_naive(GEN y, GEN P);
--GEN lift_intern0(GEN x,long v);
--#define lift_intern(x) (lift_intern0((x),-1))
- 
- /* b') Chinese Remainder Theorem */
- GEN ZM_init_CRT(GEN Hp, ulong p);
-@@ -281,103 +268,153 @@
- GEN roots_to_pol_intern(GEN L, GEN a, long v, int plus);
- GEN roots_to_pol_r1r2(GEN a, long r1, long v);
- GEN special_pivot(GEN x);
-+GEN vandermondeinverse(GEN L, GEN T, GEN den, GEN prep);
- GEN vandermondeinversemod(GEN L, GEN T, GEN den, GEN mod);
-+GEN ZX_squff(GEN f, GEN *ex);
- GEN ZX_monic_factorpadic(GEN f, GEN p, long prec);
- 
--#include "parinf.h"
-+/* Number fields */
-+GEN    arch_mul(GEN x, GEN y);
-+GEN    archstar_full_rk(GEN x, GEN bas, GEN v, GEN gen);
-+GEN    bnrGetSurj(GEN bnr1, GEN bnr2);
-+GEN    check_and_build_cycgen(GEN bnf);
-+double check_bach(double cbach, double B);
-+GEN    _checkbnf(GEN bnf);
-+GEN    _checknf(GEN nf);
-+void   check_ZKmodule(GEN x, char *s);
-+void   dbg_rel(long s, GEN col);
-+GEN    element_mulidid(GEN nf, long i, long j);
-+GEN    element_powid_mod_p(GEN nf, long I, GEN n, GEN p);
-+GEN    eltabstorel(GEN x, GEN T, GEN pol, GEN k);
-+GEN    eltmulid_get_table(GEN nf, long i);
-+GEN    eltreltoabs(GEN rnfeq, GEN x);
-+GEN    galoisbig(GEN x, long prec);
-+GEN    get_arch(GEN nf,GEN x,long prec);
-+GEN    get_arch_real(GEN nf,GEN x,GEN *emb,long prec);
-+GEN    get_bas_den(GEN bas);
-+GEN    get_hnfid(GEN nf, GEN x);
-+GEN    get_mul_table(GEN x,GEN bas,GEN invbas);
-+GEN    get_nfindex(GEN bas);
-+GEN    get_proj_modT(GEN basis, GEN T, GEN p);
-+GEN    get_roots(GEN x,long r1,long prec);
-+GEN    get_theta_abstorel(GEN T, GEN pol, GEN k);
-+GEN    idealaddtoone_i(GEN nf, GEN x, GEN y);
-+GEN    idealcoprime_fact(GEN nf, GEN x, GEN fy);
-+GEN    idealhermite_aux(GEN nf, GEN x);
-+GEN    idealsqrtn(GEN nf, GEN x, GEN gn, int strict);
-+GEN    init_unif_mod_fZ(GEN L);
-+GEN    init_units(GEN BNF);
-+long   int_elt_val(GEN nf, GEN x, GEN p, GEN bp, GEN *t);
-+GEN    isprincipalfact(GEN bnf,GEN P, GEN e, GEN C, long flag);
-+GEN    make_integral(GEN nf, GEN L0, GEN f, GEN *listpr);
-+GEN    maxord_i(GEN p, GEN f, long mf, GEN w, long flag);
-+GEN    modprM(GEN z, GEN nf,GEN modpr);
-+GEN    modprV(GEN z, GEN nf,GEN modpr);
-+GEN    modprX(GEN x, GEN nf,GEN modpr);
-+GEN    nfpol_to_Flx(GEN nf, GEN pol, ulong *ptp);
-+GEN    nfreducemodideal_i(GEN x0,GEN ideal);
-+GEN    nfrootsall_and_pr(GEN nf, GEN pol);
-+GEN    norm_by_embed(long r1, GEN x);
-+GEN    perm_to_arch(GEN nf, GEN archp);
-+GEN    pidealprimeinv(GEN nf, GEN x);
-+GEN    primedec_apply_kummer(GEN nf,GEN pol,long e,GEN p);
-+GEN    prodid(GEN nf, GEN I);
-+GEN    pr_norm(GEN pr);
-+GEN    quadhilbertreal(GEN D, long prec);
-+GEN    rnfallbase(GEN nf, GEN pol, GEN *pD, GEN *pd, GEN *pfi);
-+GEN    _rnfequation(GEN A, GEN B, long *pk, GEN *pLPRS);
-+GEN    special_anti_uniformizer(GEN nf, GEN pr);
-+GEN    sqr_by_tab(GEN tab, GEN x);
-+GEN    subgroupcondlist(GEN cyc, GEN bound, GEN listKer);
-+GEN    T2_from_embed_norm(GEN x, long r1);
-+void   testprimes(GEN bnf, ulong bound);
-+GEN    to_Fp_simple(GEN nf, GEN x, GEN ffproj);
-+GEN    unif_mod_fZ(GEN pr, GEN F);
-+GEN    unnf_minus_x(GEN x);
-+void   wr_rel(GEN col);
-+GEN    zideallog_sgn(GEN nf, GEN x, GEN sgn, GEN bid);
-+GEN    zlog_units(GEN nf, GEN U, GEN sgnU, GEN bid);
-+GEN    zlog_units_noarch(GEN nf, GEN U, GEN bid);
-+GEN    zsign_from_logarch(GEN Larch, GEN invpi, GEN archp);
-+
-+/* Dedekind zeta */
-+GEN  zeta_get_limx(long r1, long r2, long bit);
-+long zeta_get_i0(long r1, long r2, long bit, GEN limx);
-+long zeta_get_N0(GEN C,  GEN limx);
-+
- 
- /* Allocation / gerepile */
--void   debug_stack(void);
--void   fill_stack(void);
- void   init_dalloc();
- double *dalloc(size_t n);
- void   gerepilecoeffs2(pari_sp av, GEN x, int n, GEN y, int o);
- void   minim_alloc(long n, double ***q, GEN *x, double **y,  double **z, double **v);
- int    pop_entree_bloc(entree *ep, long loc);
- int    pop_val_if_newer(entree *ep, long loc);
--void   gclone_refc(GEN x);
--void   free_ep_args(entree *ep);
--
--/* naive grow-arrays */
--typedef struct {
--  void **v;
--  long len; /* len cells allocated */
--  long n; /* first n cells occupied */
--} __pari_growarray;
--typedef __pari_growarray growarray[1];
--
--growarray *pari_get_modules();
--growarray *pari_get_oldmodules();
--void    grow_append(growarray A, void *e);
--void    grow_copy(growarray A, growarray B);
--void    grow_init(growarray A);
--void    grow_kill(growarray A);
- 
- /* Interfaces (GP, etc.) */
- void  errcontext(char *msg, char *s, char *entry);
-+void  free_graph(void);
- GEN   geni(void);
--void* get_stack(double fraction, long min);
-+void* get_stack(double,int);
- GEN   gpreadseq(char *c, int strict);
-+void  init_defaults(int force);
-+void  init_graph(void);
- void  initout(int initerr);
--void  init80col(long n);
- char* itostr(GEN x, int minus);
- void  kill_from_hashlist(entree *ep, long n);
- void  member_err(char *s);
- int   pari_kernel_init(void);
--int   pari_last_was_newline(void);
--void  pari_set_last_newline(int last);
-+void  pari_sig_init(void (*f)(int));
- void  print_functions_hash(const char *s);
-+void  print_fun_list(char **matches, int nbli);
- void  print_user_fun(entree *ep);
- void  print_user_member(entree *ep);
- void  print_all_user_fun(void);
- void  print_all_user_member(void);
--void  pop_val(entree *ep);
--void  push_val(entree *ep, GEN a);
--GEN   readbin(const char *name, FILE *f, int *vector);
--void  recover(int flag);
--int   term_height(void);
- int   term_width(void);
-+void  texmacs_completion(char *s, long pos);
- void  var_make_safe();
-+int   whatnow(char *s, int flag);
- void  whatnow_new_syntax(char *f, long n);
- 
- /* defaults */
- #define is_default(s) setdefault((s),"",d_EXISTS) == gen_1
- enum { d_SILENT, d_ACKNOWLEDGE, d_INITRC, d_RETURN, d_EXISTS };
--extern ulong precreal;
-+extern ulong prec;
- 
--GEN sd_TeXstyle(const char *v, long flag);
--GEN sd_colors(char *v, long flag);
--GEN sd_compatible(const char *v, long flag);
--GEN sd_datadir(char *v, long flag);
--GEN sd_debug(const char *v, long flag);
--GEN sd_debugfiles(const char *v, long flag);
--GEN sd_debugmem(const char *v, long flag);
--GEN sd_echo(const char *v, long flag);
--GEN sd_factor_add_primes(char *v, long flag);
--GEN sd_filename(const char *v, long flag, char *s, char **f);
--GEN sd_format(const char *v, long flag);
--GEN sd_help(char *v, long flag);
--GEN sd_histsize(const char *v, long flag);
--GEN sd_lines(const char *v, long flag);
--GEN sd_log(const char *v, long flag);
--GEN sd_logfile(const char *v, long flag);
--GEN sd_new_galois_format(char *v, long flag);
--GEN sd_output(const char *v, long flag);
--GEN sd_parisize(const char *v, long flag);
--GEN sd_path(char *v, long flag);
--GEN sd_prettyprinter(char *v, long flag);
--GEN sd_primelimit(const char *v, long flag);
--GEN sd_prompt(const char *v, long flag);
--GEN sd_prompt_cont(const char *v, long flag);
--GEN sd_psfile(const char *v, long flag);
--GEN sd_realprecision(const char *v, long flag);
--GEN sd_rl(const char *v, long flag);
--GEN sd_secure(const char *v, long flag);
--GEN sd_seriesprecision(const char *v, long flag);
--GEN sd_simplify(const char *v, long flag);
--GEN sd_strictmatch(const char *v, long flag);
--GEN sd_timer(const char *v, long flag);
--GEN setdefault(const char *s, const char *v, long flag);
-+GEN sd_TeXstyle(const char *v, int flag);
-+GEN sd_colors(char *v, int flag);
-+GEN sd_compatible(const char *v, int flag);
-+GEN sd_datadir(char *v, int flag);
-+GEN sd_debug(const char *v, int flag);
-+GEN sd_debugfiles(const char *v, int flag);
-+GEN sd_debugmem(const char *v, int flag);
-+GEN sd_echo(const char *v, int flag);
-+GEN sd_factor_add_primes(char *v, int flag);
-+GEN sd_filename(const char *v, int flag, char *s, char **f);
-+GEN sd_format(const char *v, int flag);
-+GEN sd_help(char *v, int flag);
-+GEN sd_histsize(const char *v, int flag);
-+GEN sd_lines(const char *v, int flag);
-+GEN sd_log(const char *v, int flag);
-+GEN sd_logfile(const char *v, int flag);
-+GEN sd_new_galois_format(char *v, int flag);
-+GEN sd_output(const char *v, int flag);
-+GEN sd_parisize(const char *v, int flag);
-+GEN sd_path(char *v, int flag);
-+GEN sd_prettyprinter(char *v, int flag);
-+GEN sd_primelimit(const char *v, int flag);
-+GEN sd_prompt(const char *v, int flag);
-+GEN sd_prompt_cont(const char *v, int flag);
-+GEN sd_psfile(const char *v, int flag);
-+GEN sd_realprecision(const char *v, int flag);
-+GEN sd_rl(const char *v, int flag);
-+GEN sd_secure(const char *v, int flag);
-+GEN sd_seriesprecision(const char *v, int flag);
-+GEN sd_simplify(const char *v, int flag);
-+GEN sd_strictmatch(const char *v, int flag);
-+GEN sd_timer(const char *v, int flag);
-+GEN setdefault(const char *s, const char *v, int flag);
- 
- /* history */
- typedef struct {
-@@ -425,8 +462,9 @@
-   pari_timer *T;
- } gp_data;
-   /* GP_DATA->flags */
--enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
-+/* enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
-        USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512};
-+*/
- 
- extern gp_data *GP_DATA;
- 
-@@ -449,6 +487,7 @@
- void check_filtre(filtre_t *F);
- 
- gp_data *default_gp_data(void);
-+char *color_prompt(char *prompt);
- GEN  gp_history(gp_hist *H, long p, char *old, char *entry);
- GEN  set_hist_entry(gp_hist *H, GEN x);
- 
-@@ -470,384 +509,3 @@
- 
- int input_loop(filtre_t *F, input_method *IM);
- char *file_input(char **s0, int junk, input_method *IM, filtre_t *F);
--
--/* By files */
--
--/* Flx.c */
--
--GEN     FlxX_recipspec(GEN x, long l, long n, long vs);
--GEN     FlxX_sub(GEN x, GEN y, ulong p);
--GEN     FlxX_subspec(GEN x, GEN y, ulong p, long lx, long ly);
--GEN     FlxX_swap(GEN x, long n, long ws);
--GEN     FlxX_to_Kronecker(GEN P, GEN Q);
--GEN     FlxX_to_Kronecker_spec(GEN P, long lp, GEN Q);
--GEN     Flx_addshift(GEN x, GEN y, ulong p, long d);
--GEN     Flx_addspec(GEN x, GEN y, ulong p, long lx, long ly);
--GEN     Flx_even_odd_comb(GEN P, ulong u, ulong v, ulong p);
--GEN     Flx_mulspec(GEN a, GEN b, ulong p, long na, long nb);
--GEN     Flx_negspec(GEN x, ulong p, long l);
--GEN     Flx_recipspec(GEN x, long l, long n);
--GEN     Flx_sqrspec(GEN a, ulong p, long na);
--GEN     Flx_subspec(GEN x, GEN y, ulong p, long lx, long ly);
--GEN     FlxqX_from_Kronecker(GEN z, GEN T, ulong p);
--GEN     FlxqX_invmontgomery(GEN T, GEN Q, ulong p);
--GEN     FlxqX_mulspec(GEN x, GEN y, GEN T, ulong p, long lx, long ly);
--GEN     FlxqX_rem_montgomery(GEN x, GEN mg, GEN T, GEN Q, ulong p);
--
--/* Qfb.c */
--
--GEN     powimagraw(GEN x, long n);
--GEN     redimagsl2(GEN q, GEN *U);
--GEN     redrealsl2(GEN V);
--GEN     redrealsl2step(GEN A);
--GEN     sqcompimagraw(GEN x);
--GEN     sqcomprealraw(GEN x);
--
--/* RgX.c */
--
--GEN     RgXQ_matrix_pow(GEN y, long n, long m, GEN P);
--GEN     RgX_copy_spec(GEN x, long nx);
--GEN     zx_copy_spec(GEN x, long nx);
--
--/* alglin1.c */
--
--GEN     Flm_Fl_mul_inplace(GEN y, ulong x, ulong p);
--GEN     gauss_get_col(GEN a, GEN b, GEN p, long li);
--GEN     gauss_intern(GEN a, GEN b);
--GEN     matid_intern(long n,GEN myun,GEN myzero);
--void    vecselect_p(GEN A, GEN B, GEN p, long init, long lB);
--
--/* alglin2.c */
--
--GEN     Frobeniusform(GEN V, long n);
--GEN     ZM_copy(GEN x);
--GEN     ZV_Z_mul(GEN X, GEN c);
--GEN     ZV_copy(GEN x);
--void    ZV_neg_ip(GEN M);
--GEN     hnf0(GEN A, int remove);
--GEN     hnf_special(GEN x, long remove);
--GEN     hnfall0(GEN A, long remove);
--
--/* anal.c */
--
--long unsigned int  parse_option_string(char *arg, char *tmplate, long flag, char **failure, char **failure_arg);
--GEN     readexpr(char *t);
--
--/* aprcl.c */
--
--GEN     aprcl(GEN N);
--
--/* arith1.c */
--
--GEN     Z_chinese_coprime(GEN a, GEN b, GEN A, GEN B, GEN C);
--GEN     bestappr_mod(GEN x, GEN A, GEN B);
--long    hilii(GEN x, GEN y, GEN p);
--long    krouu_s(ulong x, ulong y, long s);
--
--/* arith2.c */
--
--GEN     ibitand(GEN x, GEN y);
--GEN     ibitnegimply(GEN x, GEN y);
--GEN     ibitor(GEN x, GEN y);
--GEN     ibitxor(GEN x, GEN y);
--byteptr initprimes0(ulong maxnum, long *lenp, ulong *lastp);
--long    set_optimize(long what, GEN g);
--
--/* base1.c */
--
--void    nfbasic_init(GEN x, long flag, GEN fa, nfbasic_t *T);
--GEN     nffromhnfbasis(GEN nf, GEN x);
--GEN     nftohnfbasis(GEN nf, GEN x);
--GEN     polgaloisnames(long a, long b);
--GEN     primitive_pol_to_monic(GEN pol, GEN *ptlead);
--
--/* base2.c */
--
--long    FpX_val(GEN x0, GEN t, GEN p, GEN *py);
--GEN     fast_respm(GEN f, GEN g, GEN p, long M);
--GEN     gen_if_principal(GEN bnf, GEN x);
--int     nfissquarefree(GEN nf, GEN x);
--GEN     nfreducemodpr_i(GEN x, GEN prh);
--GEN     polsymmodp(GEN g, GEN p);
--GEN     respm(GEN x, GEN y, GEN pm);
--GEN     rnfdet0(GEN nf, GEN x, GEN y);
--
--/* base3.c */
--
--GEN     FpXQ_gener(GEN T, GEN p);
--void    check_nfelt(GEN x, GEN *den);
--GEN     ff_PHlog(GEN a, GEN g, GEN T, GEN p);
--GEN     nf_PHlog(GEN nf, GEN a, GEN g, GEN pr);
--
--/* base4.c */
--
--GEN     arch_inv(GEN x);
--GEN     arch_pow(GEN x, GEN n);
--void    check_listpr(GEN x);
--GEN     factor_norm(GEN x);
--GEN     famat_to_nf(GEN nf, GEN f);
--long    val_norm(GEN x, GEN p, long *vz);
--
--/* base5.c */
--
--GEN     check_and_build_nfabs(GEN rnf);
--GEN     check_and_build_norms(GEN rnf);
--GEN     checkrnfeq(GEN x);
--GEN     hnfcenter_ip(GEN M);
--
--/* bibli1.c */
--
--GEN     gscal(GEN x, GEN y);
--GEN     lll_scaled(long MARKED, GEN X0, long D);
--GEN     lllall(GEN x, long D, int gram, long flag);
--GEN     lllintpartialall(GEN m, long flag);
--GEN     plindep(GEN x);
--GEN     pslq(GEN x);
--GEN     pslqL2(GEN x);
--GEN     sqscal(GEN x);
--
--/* bibli2.c */
--
--long    ZV_search(GEN x, GEN y);
--GEN     ZV_sort_uniq(GEN L);
--GEN     gen_vecsort(GEN x, GEN k, long flag);
--
--/* buch1.c */
--
--GEN     buchquad(GEN D, double cbach, double cbach2, long RELSUP, long prec);
--GEN     form_to_ideal(GEN x);
--GEN     getallforms(GEN D, long *pth, GEN *ptz);
--
--/* buch2.c */
--
--GEN     check_and_build_matal(GEN bnf);
--GEN     extract_full_lattice(GEN x);
--GEN     init_red_mod_units(GEN bnf, long prec);
--GEN     isprincipalarch(GEN bnf, GEN col, GEN kNx, GEN e, GEN dx, long *pe);
--GEN     red_mod_units(GEN col, GEN z, long prec);
--int     trunc_error(GEN x);
--
--/* buch3.c */
--
--GEN     minkowski_bound(GEN D, long N, long r2, long prec);
--
--/* elliptic.c */
--
--GEN     CM_CardEFp(GEN E, GEN p);
--GEN     CM_ellap(GEN E, GEN p);
--GEN     apell1(GEN e, GEN p);
--void    checkpt(GEN z);
--GEN     multi_invmod(GEN x, GEN p);
--GEN     ratroot(GEN p);
--GEN     weipell0(GEN e, long prec, long PREC);
--
--/* es.c */
--
--GEN     Str0(GEN g, long flag);
--void    bruti(GEN g, pariout_t *T, int addsign);
--const char * eng_ord(long i);
--char *  env_ok(char *s);
--void    matbruti(GEN g, pariout_t *T);
--int     pari_is_dir(char *name);
--GEN     readobj(FILE *f, int *ptc);
--void    sori(GEN g, pariout_t *T);
--void    texi(GEN g, pariout_t *T, int addsign);
--void    writeGEN(GEN x, FILE *f);
--void    writenamedGEN(GEN x, char *s, FILE *f);
--
--/* galconj.c */
--
--GEN     fixedfieldfactmod(GEN Sp, GEN p, GEN Tmod);
--GEN     fixedfieldfactor(GEN L, GEN O, GEN perm, GEN M, GEN den, GEN mod, long x, long y);
--GEN     fixedfieldinclusion(GEN O, GEN PL);
--GEN     fixedfieldorbits(GEN O, GEN L);
--GEN     fixedfieldsympol(GEN O, GEN mod, GEN l, GEN p, long v);
--GEN     galoisconj2pol(GEN x, long nbmax, long prec);
--GEN     galoiscosets(GEN O, GEN perm);
--long    intheadlong(GEN x, GEN mod);
--long    isomborne(GEN P, GEN den, GEN p);
--GEN     listznstarelts(long m, long p);
--GEN     matheadlong(GEN W, GEN mod);
--GEN     matrixnorm(GEN M, long prec);
--GEN     monomorphismlift(GEN P, GEN S, GEN Q, GEN p, long e);
--long    polheadlong(GEN P, long n, GEN mod);
--GEN     sympol_aut_evalmod(GEN sym, long g, GEN sigma, GEN Tp, GEN p);
--GEN     sympol_eval(GEN v, GEN NS);
--GEN     vandermondeinverseprep(GEN L);
--
--/* galois.c */
--
--GEN     partitions(long n);
--GEN     polgaloisnamesbig(long n, long k);
--
--/* gen1.c */
--
--int     ff_poltype(GEN *x, GEN *p, GEN *pol);
--GEN     gred_frac2(GEN x1, GEN x2);
--GEN     gred_rfrac2(GEN x1, GEN x2);
--GEN     gred_rfrac_simple(GEN n, GEN d);
--
--/* gen2.c */
--
--void    gopsg2z(GEN (*f) (GEN, GEN), long s, GEN y, GEN z);
--
--/* gen3.c */
--
--GEN     gsubst_expr(GEN pol, GEN from, GEN to);
--GEN     inv_ser(GEN b);
--GEN     mul_real(GEN x, GEN y);
--GEN     poltoser(GEN x, long v, long prec);
--GEN     qfbeval(GEN q, GEN x, GEN y);
--GEN     rfractoser(GEN x, long v, long prec);
--
--/* groupid.c */
--
--long    group_ident_i(GEN G, GEN S);
--long    group_ident_trans(GEN G, GEN S);
--long    groupelts_sumorders(GEN S);
--GEN     vecgroup_idxlist(GEN L, long order);
--long    vecgroup_sumorders(GEN L);
--
--/* ifactor1.c */
--
--GEN     ellfacteur(GEN n, int insist);
--long    ifac_decomp(GEN n, long hint);
--GEN     ifac_primary_factor(GEN *partial, long *exponent);
--void    ifac_realloc(GEN *partial, GEN *where, long new_lg);
--GEN     ifac_start(GEN n, long moebius, long hint);
--GEN     pollardbrent(GEN n);
--ulong   snextpr(ulong p, byteptr *d, long *rcn, long *q, long k);
--GEN     squfof(GEN n);
--
--/* init.c */
--
--void    err_recover(long numerr);
--GEN     gcopy_av(GEN x, GEN *AVMA);
--int     ok_gerepileupto(GEN x);
--void    pari_init_defaults(void);
--
--/* nffactor.c */
--
--long    ZM_get_prec(GEN x);
--int     nfissplit(GEN nf, GEN x);
--
--/* perm.c */
--
--long    cosets_perm_search(GEN C, GEN p);
--GEN     group_export_GAP(GEN G);
--GEN     group_export_MAGMA(GEN G);
--GEN     perm_conj(GEN s, GEN t);
--GEN     perm_generate(GEN S, GEN H, long o);
--long    perm_relorder(GEN p, GEN S);
--GEN     perm_to_GAP(GEN p);
--GEN     quotient_subgroup_lift(GEN C, GEN H, GEN S);
--
--/* polarit1.c */
--
--GEN     Flx_Berlekamp_ker(GEN u, ulong p);
--GEN     FpX_Berlekamp_ker(GEN u, GEN p);
--GEN     FpX_factcantor(GEN f, GEN pp, long flag);
--GEN     FqX_Berlekamp_ker(GEN u, GEN T, GEN q, GEN p);
--GEN     FqX_rand(long d1, long v, GEN T, GEN p);
--long    FqX_split_Berlekamp(GEN *t, GEN q, GEN T, GEN p);
--GEN     Zp_appr(GEN f, GEN a);
--int     cmp_padic(GEN x, GEN y);
--GEN     factcantor0(GEN f, GEN pp, long flag);
--GEN     zrhqr(GEN a, long prec);
--
--/* polarit2.c */
--
--GEN     DDF_roots(GEN pol, GEN polp, GEN p);
--GEN     Q_divmuli_to_int(GEN x, GEN d, GEN n);
--long    checkdeflate(GEN x);
--void    factor_quad(GEN x, GEN res, long *ptcnt);
--GEN     factorback_aux(GEN fa, GEN e, GEN (*_mul) (void *, GEN, GEN), GEN (*_pow) (void *, GEN, GEN), void *data);
--GEN     matratlift(GEN M, GEN mod, GEN amax, GEN bmax, GEN denom);
--GEN     pseudodiv(GEN x, GEN y, GEN *ptr);
--long    s_centermod(long x, ulong pp, ulong pps2);
--GEN     sort_vecpol_gen(GEN a, int (*cmp) (GEN, GEN));
--GEN     sylvestermatrix_i(GEN x, GEN y);
--
--/* polarit3.c */
--
--GEN     Flm_Frobenius_pow(GEN M, long d, GEN T, ulong p);
--GEN     Flxq_matrix_pow(GEN y, long n, long m, GEN P, ulong l);
--GEN     FpM_Frobenius_pow(GEN M, long d, GEN T, GEN p);
--GEN     FpXQ_sqrtl(GEN a, GEN l, GEN T, GEN p, GEN q, long e, GEN r, GEN y, GEN m);
--GEN     FpXYQQ_pow(GEN x, GEN n, GEN S, GEN T, GEN p);
--GEN     FpX_compositum(GEN A, GEN B, GEN p);
--GEN     FpX_direct_compositum(GEN A, GEN B, GEN p);
--GEN     FpX_div_by_X_x(GEN a, GEN x, GEN p, GEN *r);
--GEN     FpX_gcd_check(GEN x, GEN y, GEN p);
--GEN     RgX_to_FpXQX(GEN x, GEN T, GEN p);
--GEN     Rg_to_FpXQ(GEN x, GEN T, GEN p);
--int     ZX_incremental_CRT(GEN *ptH, GEN Hp, GEN q, GEN qp, ulong p);
--GEN     ZX_init_CRT(GEN Hp, ulong p, long v);
--ulong   ZY_ZXY_ResBound(GEN A, GEN B, GEN dB);
--int     Z_incremental_CRT(GEN *H, ulong Hp, GEN q, GEN qp, ulong p);
--GEN     ffinit_Artin_Shreier(GEN ip, long l);
--GEN     ffinit_rand(GEN p, long n);
--byteptr init_modular(ulong *p);
--GEN     polint_triv(GEN xa, GEN ya);
--
--/* rootpol.c */
--
--GEN     FFT(GEN x, GEN Omega);
--GEN     FFTinit(long k, long prec);
--
--/* subcyclo.c */
--
--GEN     bnr_to_znstar(GEN bnr, long *complex);
--GEN     galoiscyclo(long n, long v);
--GEN     subcyclo_complex_bound(pari_sp ltop, GEN V, long prec);
--GEN     subcyclo_complex_roots(long n, long real, long prec);
--GEN     subcyclo_cyclic(long n, long d, long m, long z, long g, GEN powz, GEN le);
--GEN     subcyclo_orbits(long n, GEN H, GEN O, GEN powz, GEN le);
--GEN     subcyclo_roots(long n, GEN zl);
--GEN     subcyclo_start(long n, long d, long o, GEN borne, long *ptr_val, long *ptr_l);
--GEN     znstar_bits(long n, GEN H);
--long    znstar_conductor(long n, GEN H);
--GEN     znstar_coset_bits(long n, GEN H, long c);
--void    znstar_coset_bits_inplace(long n, GEN H, GEN bits, long c);
--void    znstar_coset_func(long n, GEN H, void (*func) (void *, long), void *data, long c);
--GEN     znstar_cosets(long n, long phi_n, GEN H);
--GEN     znstar_elts(long n, GEN H);
--GEN     znstar_generate(long n, GEN V);
--GEN     znstar_hnf(GEN Z, GEN M);
--GEN     znstar_hnf_generators(GEN Z, GEN M);
--GEN     znstar_partial_bits(long n, GEN H, long d);
--GEN     znstar_partial_coset_bits(long n, GEN H, long d, long c);
--void    znstar_partial_coset_bits_inplace(long n, GEN H, GEN bits, long d, long c);
--void    znstar_partial_coset_func(long n, GEN H, void (*func) (void *, long), void *data, long d, long c);
--GEN     znstar_reduce_modulus(GEN H, long n);
--
--/* thue.c */
--
--GEN     bnfisintnormabs(GEN bnf, GEN a);
--
--/* trans1.c */
--
--GEN     constlog2(long prec);
--GEN     padic_sqrt(GEN x);
--GEN     padic_sqrtn(GEN x, GEN n, GEN *zetan);
--GEN     padic_sqrtn_ram(GEN x, long e);
--GEN     padic_sqrtn_unram(GEN x, GEN n, GEN *zetan);
--void    pari_init_floats(void);
--GEN     rootsof1complex(GEN n, long prec);
--GEN     rootsof1padic(GEN n, GEN y);
--
--/* trans2.c */
--
--GEN     cxpsi(GEN s0, long prec);
--double  darg(double s, double t);
--
--/* trans3.c */
--
--GEN     bernreal_using_zeta(long n, GEN iz, long prec);
--GEN     czeta(GEN s0, long prec);
--GEN     inv_szeta_euler(long n, double lba, long prec);
--GEN     kbesselnew(GEN n, GEN z, long prec);
--GEN     polylogd0(long m, GEN x, long flag, long prec);
--GEN     twistpartialzeta(GEN p, GEN q, long f, long c, GEN va, GEN cff);
--
--ENDEXTERN

new file patches/paripriv.h.patch

@@ +1 @@
+--- src/headers/paripriv.h      (revision 12541)
++++ src/headers/paripriv.h      (working copy)
+@@ -333,7 +333,11 @@
+   pari_timer *T;
+ } gp_data;
+   /* GP_DATA->flags */
+-enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
++
++/* The ECHO symbol is already defined in Sage when building on OS X. Since this is paripriv.h, 
++   it's very unlikely that anything in here is used, so this should be safe. */
++
++enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, xxECHOxx=16, STRICTMATCH=32,
+        USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512, BREAKLOOP=1024,
+        RECOVER=2048};
+ 

new file spkg-check

@@ +1 @@
+#!/usr/bin/env bash
+if [ -z "$SAGE_LOCAL" ]; then
+   echo "SAGE_LOCAL undefined ... exiting";
+   echo "Maybe run 'sage -sh'?"
+   exit 1
+fi
+
+# Let the user chose a flag other than -m64 for 64-bit builds
+# if needed.
+if [ -z "$CFLAG64" ] ; then
+   CFLAG64=-m64
+fi
+
+if [ "x$SAGE64" = xyes ]; then
+    CFLAGS="$CFLAGS $CFLAG64" 
+    CC="$CC $CFLAG64" && export CC
+fi
+
+if [ "x$SAGE_DEBUG" = xyes ] ; then
+   CFLAGS="$CFLAGS -O0 -g" # No optimisation. Good for debugging or working around compiler bugs.
+else
+   CFLAGS="$CFLAGS -O3 -g" # Default optimisation.
+fi
+
+export CFLAGS
+
+cd src 
+
+make test-all
+
+if [ $? -ne 0 ] ; then
+   echo "Pari failed the self-tests when running 'make test-all'"
+   exit 1 
+fi
+
+if [ -d ../parisvn ] ; then
+        echo "WARNING: you should delete the parisvn directory before submitting this spkg."
+fi
+
+echo "The Pari self-tests all passed" 
+exit 0 
+

deleted file spkg-dist

@@ -1 @@
-#!/usr/bin/env python
-
-import os, sys, time
-
-os.chdir('src/')
-
-def cmd(x):
-    print x
-    if os.system(x):
-        print "(Failed.)"
-
-cmd("rm -rf Odos")
-
-# Now modify init.c so we abort instead of exiting, so that
-# Sage can catch errors that PARI raises.
-print "Modifying init.c for Sage usage"
-
-init_c = "src/language/init.c"
-init = open(init_c).read()
-i = init.find('fprintferr("  ***   Error in the PARI system.')
-init = init[:i] + "\n\tabort();\n\t" + init[i:]
-i = init.find('msg="unknown signal";')
-init = init[:i] + "\n\tabort();\n\t" + init[i:]
-open(init_c,'w').write(init)
-
-print "Modifying  src/kernel/gmp/mp.c"
-mp_file = "src/kernel/gmp/mp.c"
-mp = open(mp_file).read()
-mp = mp.replace('mp_set_memory_functions', 'return 0; mp_set_memory_functions')
-open(mp_file,'w').write(mp)
-
-
-
-

spkg-install

@@ -1 @@
-B1;2000;0c#!/bin/sh
+#!/usr/bin/env bash
 ###########################################
 ## PARI
 ###########################################
 
+if [ -z "$SAGE_LOCAL" ]; then
+   echo "SAGE_LOCAL undefined ... exiting";
+   echo "Maybe run 'sage -sh'?"
+   exit 1
+fi
+
 TOP=`pwd`
+PATCHED="$TOP/patches/files"
 
-# As of PARI 2.3.3, the compiler flag -fPIC is not added on Solaris, but it
-# needs to be if using gcc. I assume the equivalent will be needed on 
-# other compilers. 
-
-if [ `uname` = "SunOS" ]; then
-    sed 's/-fomit-frame-pointer/-fomit-frame-pointer -fPIC/g' src/config/get_cc > src/config/get_cc.$$
-    mv src/config/get_cc.$$ src/config/get_cc
-fi
+###########################################################
+## patching src files.  See patches/README.txt for details
+###########################################################
 
 cd src
 
-# extract the SEA data file in the appropriate place, so that the build pari will support
-# fast point counting over finite fields
-tar xf ../seadata.tar 
+# These two are needed so that Sage can catch PARI's error signals. 
+cp "$PATCHED/init.c"  src/language/init.c
+cp "$PATCHED/mp.c"    src/kernel/gmp/mp.c 
 
-#cp "$TOP"/patches/get_dlld config/
+# Fix for PARI bug 1079 (jdemeyer: temporary until this is fixed upstream)
+cp "$PATCHED/base2.c" "$PATCHED/polarit3.c" src/basemath/
 
-# mabshoff: This patch is to get around problem in PPC 32-bit Linux build
-# (but it is ok on any other machine)
-#cp "$TOP"/patches/get_dlcflags config/
-
-# pjeremy: fix for FreeBSD: #7825
-#cp "$TOP"/patches/get_kernel config/
 
 # cwitty: disable -rpath
-#cp "$TOP"/patches/get_ld config/
+cp "$PATCHED/get_ld" config/
 
 # cwitty: disable TeX; allow bz2 compression
-#cp "$TOP"/patches/gphelp.in doc/
+cp "$PATCHED/gphelp.in" doc/
 
-# Minh Van Nguyen: copy over patched get_cc (see ticket #7092). It's
-# reported that 32-bit Fedora 11 would fail to build otherwise.
-#if [ `uname` = "Linux" ]; then
-#    cp "$TOP"/patches/get_cc config/get_cc
-#fi
+# John Cremona: copy over a lightly patched get_tests, so that make
+# test-all does not test ellglobalred (which requires the elldata
+# package Sage does not install).
+cp "$PATCHED/get_tests" config/
+
+# Add -fno-common to DLCFLAGS on Darwin
+cp "$PATCHED/get_dlcflags" config/
+
+# Two configure patches for Solaris
+cp "$PATCHED/Configure" .
+cp "$PATCHED/Makefile.SH" config/
+
 
 # This is needed or there are weird locale problems involving rpath
 # with building Sage.
@@ -51 +55 @@
 build()
 {
     #  add the proper flags for 64-bit build mode on OS X and Open Solaris x64
+    # Setting CFLAGS is not sufficient on Solaris since PARI 2.4.3, as this 
+    # flag is not being used when the check for GMP and Readline are made
+    # so the checks for them fail.  One must redefine CC and export that. 
+    
+    # Let the user chose a flag other than -m64 for 64-bit builds 
+    # if needed. 
+    if [ -z "$CFLAG64" ] ; then 
+       CFLAG64=-m64
+    fi
+
     if [ "x$SAGE64" = xyes ]; then
-        CFLAGS="-g -m64 " && export CFLAGS
+        CFLAGS="$CFLAGS $CFLAG64" 
+        CC="$CC $CFLAG64" && export CC
     fi
 
+    if [ "x$SAGE_DEBUG" = xyes ] ; then
+       CFLAGS="$CFLAGS -O0 -g" # No optimisation. Good for debugging or working around compiler bugs. 
+    else
+       CFLAGS="$CFLAGS -O3 -g" # Default optimisation. 
+    fi 
+    export CFLAGS
+
     CUR=`pwd`
 
     # On my systems PARI does *not* build correctly with these set! (and
@@ -68 +90 @@
         PARI_EXTRA_OPTS=" --graphic=none "
     fi
 
-    ./Configure $PARI_EXTRA_OPTS --prefix=$SAGE_LOCAL --with-readline=$SAGE_LOCAL --with-gmp=$SAGE_LOCAL --kernel=gmp --graphic=none
+    # Allow the user to tune PARI - this is time-consuming, but some may want to do it. 
+    # It is also very unreliable
+    if [ "x$SAGE_TUNE_pari" = xyes ] ; then 
+       echo ""
+       echo "PARI will be tuned for your system since you set SAGE_TUNE_pari=\"yes\"."
+       echo "This can take a long time." 
+       echo "WARNING: Tuning PARI is VERY unreliable. You may find your build"
+       echo "of PARI fails, or PARI does not work properly once built." 
+       echo ""
+       ./Configure $PARI_EXTRA_OPTS --prefix=$SAGE_LOCAL --with-readline=$SAGE_LOCAL --with-gmp=$SAGE_LOCAL --kernel=gmp --graphic=none --tune
+    else
+       echo "To minimize Sage build time and to ensure the best relieability, PARI"
+       echo "will not be tuned for your system. Experience shows tuning is"
+       echo "unreliable: see http://trac.sagemath.org/sage_trac/ticket/9343"
+       echo "If you wish to test the tuning code, set the environment variable"
+       echo "SAGE_TUNE_pari=yes by typing the following before building Sage (or at"
+       echo "least before building PARI):"
+       echo "SAGE_TUNE_pari=yes" 
+       echo "export SAGE_TUNE_pari"
+       echo ""
+       ./Configure $PARI_EXTRA_OPTS --prefix=$SAGE_LOCAL --with-readline=$SAGE_LOCAL --with-gmp=$SAGE_LOCAL --kernel=gmp --graphic=none
+    fi
 
     if [ $? -ne 0 ]; then
         echo "ERROR - configure PARI with readline and gmp failed."
@@ -140 +183 @@
     # The following is a hack to get the library installed correctly
     # on OS X.
     if [ $UNAME = "Darwin" ]; then
-        echo "MAC OS X hack -- delete and reinstall libpari.a"
-        rm -f Odarwin-ppc/*lib*
-        $MAKE install-lib-sta
+        echo "MAC OS X hack -- delete and reinstall libpari.a"
+        rm -f Odarwin-ppc/*lib*
+        $MAKE install-lib-sta
 
         if [ $? -ne 0 ]; then
             echo "Error Re-installing PARI static libraries (OS X trick)"
@@ -150 +193 @@
         fi
 
         cd `config/objdir`
-        cp -f libpari* $SAGE_LOCAL/lib
+        cp -f libpari* "$SAGE_LOCAL"/lib
         cd "$CUR"
 
         # Also another patch since paripriv.h won't compile right on OS X
         # when used by client Sage code.  So we replace it by a slightly
         # modified version.
-        cp -pf "$TOP"/patches/paripriv-osx.h $SAGE_LOCAL/include/pari/paripriv.h
+        cp -pf "$PATCHED/paripriv.h" "$SAGE_LOCAL/include/pari/paripriv.h"
     fi
     # Like on OS X (see above), the Sage library would not build
     # without some changes. Though on Solaris the changes are much simpler than
@@ -165 +208 @@
        set -e
        echo "Patching include/pari/paripriv.h so it works on Solaris"
        echo "The changes are much smaller than needed on OS X"
-       cp  "$TOP"/patches/paripriv-Solaris.h $SAGE_LOCAL/include/pari/paripriv.h
+       cp  "$PATCHED/paripriv.h" $SAGE_LOCAL/include/pari/paripriv.h
        set +e 
     elif [ "$UNAME" = "CYGWIN" ]; then
        # We need to the same thing on Cygwin that we have to do on Solaris
-       cp  "$TOP"/patches/paripriv-Solaris.h $SAGE_LOCAL/include/pari/paripriv.h
+       cp  "$PATCHED/paripriv.h" $SAGE_LOCAL/include/pari/paripriv.h
     fi
 
     echo "Installing extra Galois groups data."

new file spkg-make

@@ +1 @@
+#!/usr/bin/env bash
+#
+# Script to prepare a PARI spkg for Sage.  This script is only for the
+# package maintainer, not for building PARI during a Sage install.
+# WARNING: This script will delete/overwrite files in this directory
+# and its subdirectories!
+#
+# HOW TO MAKE THE SPKG:
+# 1) ./spkg-make
+# 2) rm -rf parisvn    (For final distribution, not necessary for testing)
+# 3) cd ..; sage -pkg pari-2.4.3.whatever_the_name_of_the_package_is
+#
+# If something goes wrong, try rm -rf parisvn and try again.
+#
+# This script does the following:
+# * If the directory ./parisvn/ exists, it is assumed to be a SVN
+#   repository of the PARI sources.  If it does not exist, the SVN
+#   sources are automatically downloaded.  In any case, the SVN sources
+#   are updated to a specific version.
+# * If the file parisvn/galdata.tgz does not exist, it is downloaded.
+# * The same for the file parisvn/seadata-small.tgz
+# * PARI is configured and built in the parisvn directory.  The built
+#   executables are not needed, but some files generated in the
+#   process (using bison for example) are needed.
+# * The necessary files are copied from parisvn/ to src/ using a
+#   mechanism very similar to "make svnsnapshot" from PARI.
+# * The files parisvn/galdata.tgz and parisvn/seadata-small.tgz are
+#   extracted.
+# * The patches in patches/*.patch are applied and the complete patched
+#   files are copied to patches/files
+#
+# AUTHOR: Jeroen Demeyer (July 2010)
+
+
+# Sanity check: must be run from current directory
+if ! [ -f spkg-make ]; then
+        echo >&2 "This script must be run from its own source directory!"
+        exit 1
+fi
+
+
+# Clean an existing src/ directory
+rm -rf src
+mkdir src
+
+
+# Download SVN sources to parisvn/
+if ! [ -d parisvn ]; then
+        svn checkout svn://pari.math.u-bordeaux.fr/pari/trunk parisvn
+fi
+
+
+# Download galdata.tgz and seadata-small.tgz
+[ -f parisvn/galdata.tgz ] || wget -O parisvn/galdata.tgz \
+        http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz
+[ -f parisvn/seadata-small.tgz ] || wget -O parisvn/seadata-small.tgz \
+        http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz
+
+
+# Use the specified SVN version
+cd parisvn
+svn update -r 12577
+
+
+# make pari (must run bison, etc...)
+./Configure || exit
+make gp doc || exit
+
+
+# Copy the needed files to src using a tar pipe.  This is based on code
+# from config/settar.
+tar c `config/get_MANIFEST` | ( cd ../src && tar xv )
+
+# Save svn version (see config/settar)
+svnversion >../src/config/svnversion
+
+
+# Extract the tgz files
+for tgzfile in galdata.tgz seadata-small.tgz; do
+        ( cd ../src && tar xvz ) < "$tgzfile"
+done
+
+
+# Run through the patches in patches/*.patch and prepare the patched
+# files in patches/files
+rm -rf ../patches/files
+mkdir ../patches/files
+for patch in ../patches/*.patch; do
+        # Check that every patch file changes only one file
+        numfilesinpatch=`grep -c -e '^+++ ' "$patch"`
+        if [ "$numfilesinpatch" != "1" ]; then
+                echo "Bad patch file $patch.  It must patch exactly one file."
+        fi
+
+        srcfile=`sed -n 's|^+++ \([^\t]*\)\(\t.*\)\?|\1|p' "$patch"`
+        outfile="../patches/files/`basename $srcfile`"
+        patch -o "$outfile" -p0 <"$patch" || exit
+        chmod "--reference=$srcfile" "$outfile"
+done
+
+
+# We're done!
+cd ..
+echo "======================================================"
+echo "Done downloading PARI and creating the src/ directory."
+echo "If everything looks okay, proceed as follows:"
+echo "  rm -rf parisvn"
+echo "  cd .."
+echo -n "  sage -pkg "; basename `pwd`