From 151c147a358f2a70b4750baff20fe98bf44dea2d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (laptop)" <j.wuttke@fz-juelich.de>
Date: Fri, 16 Sep 2011 08:51:21 +0200
Subject: [PATCH] by default, use Gnuplot symbols in PostScript output; explain
them in share/gnuplot-default-symbols.eps
---
pub/aclocal.m4 | 4 +-
pub/configure | 466 ++++----
pub/share/Makefile.am | 2 +-
pub/share/Makefile.in | 2 +-
pub/share/frida.ini | 3 +-
pub/share/g3.ps | 35 +-
pub/share/gnuplot-default-symbols.eps | 1587 +++++++++++++++++++++++++
pub/share/wups11a.ps | 10 +
pub/src/commands.cpp | 4 +
9 files changed, 1851 insertions(+), 262 deletions(-)
create mode 100644 pub/share/gnuplot-default-symbols.eps
diff --git a/pub/aclocal.m4 b/pub/aclocal.m4
index 1bc55f42..eba341be 100644
--- a/pub/aclocal.m4
+++ b/pub/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/pub/configure b/pub/configure
index 8084f47c..6b8d7df6 100755
--- a/pub/configure
+++ b/pub/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for frida post-2.1.3a.
+# Generated by GNU Autoconf 2.67 for frida post-2.1.3a.
#
# Report bugs to <j.wuttke@fz-juelich.de>.
#
@@ -91,7 +91,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -217,18 +216,11 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -1125,7 +1117,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
@@ -1350,9 +1342,8 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CC C compiler command
CFLAGS C compiler flags
- YACC The `Yet Another Compiler Compiler' implementation to use.
- Defaults to the first program found out of: `bison -y', `byacc',
- `yacc'.
+ YACC The `Yet Another C Compiler' implementation to use. Defaults to
+ the first program found out of: `bison -y', `byacc', `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
This script will default YFLAGS to the empty string to avoid a
default value of `-d' given by some make applications.
@@ -1425,7 +1416,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
frida configure post-2.1.3a
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1471,7 +1462,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -1509,7 +1500,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1555,7 +1546,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1592,7 +1583,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1634,7 +1625,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1647,10 +1638,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1717,7 +1708,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -1726,7 +1717,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_mongrel
@@ -1739,7 +1730,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1757,64 +1748,10 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_header_compile
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1823,7 +1760,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1878,10 +1815,64 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_check_func
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
# ac_fn_c_find_intX_t LINENO BITS VAR
# -----------------------------------
# Finds a signed integer type with width BITS, setting cache variable VAR
@@ -1891,7 +1882,7 @@ ac_fn_c_find_intX_t ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
$as_echo_n "checking for int$2_t... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -1952,7 +1943,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_find_intX_t
@@ -1965,7 +1956,7 @@ ac_fn_c_find_uintX_t ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
$as_echo_n "checking for uint$2_t... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2005,7 +1996,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
} # ac_fn_c_find_uintX_t
cat >config.log <<_ACEOF
@@ -2013,7 +2004,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by frida $as_me post-2.1.3a, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2271,7 +2262,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -2421,7 +2412,7 @@ am__api_version='1.11'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2508,11 +2499,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2598,7 +2589,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2638,7 +2629,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2691,7 +2682,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2742,7 +2733,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2782,7 +2773,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2908,7 +2899,7 @@ if test -z "$CXX"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -2952,7 +2943,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -3116,7 +3107,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3159,7 +3150,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3218,7 +3209,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
@@ -3229,7 +3220,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3270,7 +3261,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3280,7 +3271,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3317,7 +3308,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3465,7 +3456,7 @@ depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3598,7 +3589,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3638,7 +3629,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3691,7 +3682,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3731,7 +3722,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3790,7 +3781,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3834,7 +3825,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3889,7 +3880,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3918,7 +3909,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3955,7 +3946,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4033,7 +4024,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4132,7 +4123,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4262,7 +4253,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
+if test "${ac_cv_prog_LEX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
@@ -4332,7 +4323,7 @@ $as_echo "$ac_try_echo"; } >&5
test $ac_status = 0; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
$as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
+if test "${ac_cv_prog_lex_root+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -4351,7 +4342,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
if test -z "${LEXLIB+set}"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
$as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
+if test "${ac_cv_lib_lex+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -4381,7 +4372,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
@@ -4392,8 +4383,7 @@ ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
- #define YYTEXT_POINTER 1
+#define YYTEXT_POINTER 1
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -4423,7 +4413,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
+if test "${ac_cv_prog_YACC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
@@ -4470,7 +4460,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
$as_echo_n "checking for cos in -lm... " >&6; }
-if ${ac_cv_lib_m_cos+:} false; then :
+if test "${ac_cv_lib_m_cos+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4504,7 +4494,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
$as_echo "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes; then :
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -4517,7 +4507,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lgslcblas" >&5
$as_echo_n "checking for cblas_dgemm in -lgslcblas... " >&6; }
-if ${ac_cv_lib_gslcblas_cblas_dgemm+:} false; then :
+if test "${ac_cv_lib_gslcblas_cblas_dgemm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4551,7 +4541,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gslcblas_cblas_dgemm" >&5
$as_echo "$ac_cv_lib_gslcblas_cblas_dgemm" >&6; }
-if test "x$ac_cv_lib_gslcblas_cblas_dgemm" = xyes; then :
+if test "x$ac_cv_lib_gslcblas_cblas_dgemm" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSLCBLAS 1
_ACEOF
@@ -4564,7 +4554,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsl_blas_dgemm in -lgsl" >&5
$as_echo_n "checking for gsl_blas_dgemm in -lgsl... " >&6; }
-if ${ac_cv_lib_gsl_gsl_blas_dgemm+:} false; then :
+if test "${ac_cv_lib_gsl_gsl_blas_dgemm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4598,7 +4588,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsl_gsl_blas_dgemm" >&5
$as_echo "$ac_cv_lib_gsl_gsl_blas_dgemm" >&6; }
-if test "x$ac_cv_lib_gsl_gsl_blas_dgemm" = xyes; then :
+if test "x$ac_cv_lib_gsl_gsl_blas_dgemm" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSL 1
_ACEOF
@@ -4611,7 +4601,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_r2r_1d in -lfftw3" >&5
$as_echo_n "checking for fftw_plan_r2r_1d in -lfftw3... " >&6; }
-if ${ac_cv_lib_fftw3_fftw_plan_r2r_1d+:} false; then :
+if test "${ac_cv_lib_fftw3_fftw_plan_r2r_1d+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4645,7 +4635,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_r2r_1d" >&5
$as_echo "$ac_cv_lib_fftw3_fftw_plan_r2r_1d" >&6; }
-if test "x$ac_cv_lib_fftw3_fftw_plan_r2r_1d" = xyes; then :
+if test "x$ac_cv_lib_fftw3_fftw_plan_r2r_1d" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFFTW3 1
_ACEOF
@@ -4661,7 +4651,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lmmin in -llmmin" >&5
$as_echo_n "checking for lmmin in -llmmin... " >&6; }
-if ${ac_cv_lib_lmmin_lmmin+:} false; then :
+if test "${ac_cv_lib_lmmin_lmmin+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4695,7 +4685,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lmmin_lmmin" >&5
$as_echo "$ac_cv_lib_lmmin_lmmin" >&6; }
-if test "x$ac_cv_lib_lmmin_lmmin" = xyes; then :
+if test "x$ac_cv_lib_lmmin_lmmin" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLMMIN 1
_ACEOF
@@ -4709,7 +4699,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kwwcf in -lkww" >&5
$as_echo_n "checking for kwwcf in -lkww... " >&6; }
-if ${ac_cv_lib_kww_kwwcf+:} false; then :
+if test "${ac_cv_lib_kww_kwwcf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4743,7 +4733,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kww_kwwcf" >&5
$as_echo "$ac_cv_lib_kww_kwwcf" >&6; }
-if test "x$ac_cv_lib_kww_kwwcf" = xyes; then :
+if test "x$ac_cv_lib_kww_kwwcf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKWW 1
_ACEOF
@@ -4785,7 +4775,7 @@ _ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4819,7 +4809,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBREADLINE 1
_ACEOF
@@ -4863,7 +4853,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -4979,7 +4969,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -4991,7 +4981,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -5054,7 +5044,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5121,7 +5111,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5251,7 +5241,7 @@ done
for ac_header in fcntl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = xyes; then :
+if test "x$ac_cv_header_fcntl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FCNTL_H 1
_ACEOF
@@ -5265,7 +5255,7 @@ done
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
@@ -5279,7 +5269,7 @@ done
for ac_header in string.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes; then :
+if test "x$ac_cv_header_string_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRING_H 1
_ACEOF
@@ -5293,7 +5283,7 @@ done
for ac_header in sys/time.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
+if test "x$ac_cv_header_sys_time_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_TIME_H 1
_ACEOF
@@ -5307,7 +5297,7 @@ done
for ac_header in unistd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
+if test "x$ac_cv_header_unistd_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_UNISTD_H 1
_ACEOF
@@ -5322,7 +5312,7 @@ done
for ac_header in boost/regex.hpp
do :
ac_fn_c_check_header_mongrel "$LINENO" "boost/regex.hpp" "ac_cv_header_boost_regex_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_regex_hpp" = xyes; then :
+if test "x$ac_cv_header_boost_regex_hpp" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BOOST_REGEX_HPP 1
_ACEOF
@@ -5339,22 +5329,11 @@ done
# ,AC_MSG_ERROR([Cannot find boost/shared_ptr.hpp.]))
# the following are needed by yacc generated code:
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5387,7 +5366,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5406,7 +5385,7 @@ else
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
# endif
# endif
# endif
@@ -5450,7 +5429,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5491,7 +5470,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -5542,7 +5521,7 @@ fi
for ac_header in inttypes.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = xyes; then :
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_INTTYPES_H 1
_ACEOF
@@ -5556,7 +5535,7 @@ done
for ac_header in libintl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL_H 1
_ACEOF
@@ -5570,7 +5549,7 @@ done
for ac_header in stddef.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
-if test "x$ac_cv_header_stddef_h" = xyes; then :
+if test "x$ac_cv_header_stddef_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDDEF_H 1
_ACEOF
@@ -5584,7 +5563,7 @@ done
for ac_header in malloc.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = xyes; then :
+if test "x$ac_cv_header_malloc_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MALLOC_H 1
_ACEOF
@@ -5599,7 +5578,7 @@ done
# Checks for typedefs, structures, and compiler characteristics
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
+if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5679,7 +5658,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
@@ -5721,7 +5700,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5753,7 +5732,7 @@ else
char b[false == 0 ? 1 : -1];
char c[__bool_true_false_are_defined == 1 ? 1 : -1];
char d[(bool) 0.5 == true ? 1 : -1];
- /* See body of main program for 'e'. */
+ bool e = &s;
char f[(_Bool) 0.0 == false ? 1 : -1];
char g[true];
char h[sizeof (_Bool)];
@@ -5764,6 +5743,25 @@ else
_Bool n[m];
char o[sizeof n == m * sizeof n[0] ? 1 : -1];
char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+# if defined __xlc__ || defined __GNUC__
+ /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+ reported by James Lemley on 2005-10-05; see
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+ This test is not quite right, since xlc is allowed to
+ reject this program, as the initializer for xlcbug is
+ not one of the forms that C requires support for.
+ However, doing the test right would require a runtime
+ test, and that would make cross-compilation harder.
+ Let us hope that IBM fixes the xlc bug, and also adds
+ support for this kind of constant expression. In the
+ meantime, this test will reject xlc, which is OK, since
+ our stdbool.h substitute should suffice. We also test
+ this with GCC, where it should work, to detect more
+ quickly whether someone messes up the test in the
+ future. */
+ char digs[] = "0123456789";
+ int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+# endif
/* Catch a bug in an HP-UX C compiler. See
http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
@@ -5775,7 +5773,6 @@ int
main ()
{
- bool e = &s;
*pq |= q;
*pq |= ! q;
/* Refer to every declared value, to avoid compiler optimizations. */
@@ -5796,7 +5793,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
+if test "x$ac_cv_type__Bool" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
@@ -5885,7 +5882,7 @@ _ACEOF
esac
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
else
@@ -5897,7 +5894,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
+if test "${ac_cv_header_time+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5932,7 +5929,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
+if test "${ac_cv_struct_tm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5970,7 +5967,7 @@ fi
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
@@ -5981,7 +5978,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -6041,7 +6038,7 @@ fi
for ac_header in stdlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STDLIB_H 1
_ACEOF
@@ -6052,7 +6049,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -6147,7 +6144,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
-if ${ac_cv_func_working_mktime+:} false; then :
+if test "${ac_cv_func_working_mktime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -6371,7 +6368,7 @@ fi
for ac_func in strftime
do :
ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = xyes; then :
+if test "x$ac_cv_func_strftime" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
@@ -6380,7 +6377,7 @@ else
# strftime is in -lintl on SCO UNIX.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
$as_echo_n "checking for strftime in -lintl... " >&6; }
-if ${ac_cv_lib_intl_strftime+:} false; then :
+if test "${ac_cv_lib_intl_strftime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6414,7 +6411,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
@@ -6426,7 +6423,7 @@ done
for ac_func in floor
do :
ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor"
-if test "x$ac_cv_func_floor" = xyes; then :
+if test "x$ac_cv_func_floor" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FLOOR 1
_ACEOF
@@ -6439,7 +6436,7 @@ done
for ac_func in gettimeofday
do :
ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes; then :
+if test "x$ac_cv_func_gettimeofday" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETTIMEOFDAY 1
_ACEOF
@@ -6452,7 +6449,7 @@ done
for ac_func in memset
do :
ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = xyes; then :
+if test "x$ac_cv_func_memset" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MEMSET 1
_ACEOF
@@ -6465,7 +6462,7 @@ done
for ac_func in mkfifo
do :
ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
-if test "x$ac_cv_func_mkfifo" = xyes; then :
+if test "x$ac_cv_func_mkfifo" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MKFIFO 1
_ACEOF
@@ -6478,7 +6475,7 @@ done
for ac_func in pow
do :
ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
+if test "x$ac_cv_func_pow" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_POW 1
_ACEOF
@@ -6491,7 +6488,7 @@ done
for ac_func in sqrt
do :
ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt"
-if test "x$ac_cv_func_sqrt" = xyes; then :
+if test "x$ac_cv_func_sqrt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SQRT 1
_ACEOF
@@ -6504,7 +6501,7 @@ done
for ac_func in strchr
do :
ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr"
-if test "x$ac_cv_func_strchr" = xyes; then :
+if test "x$ac_cv_func_strchr" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRCHR 1
_ACEOF
@@ -6525,7 +6522,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GNUPLOT+:} false; then :
+if test "${ac_cv_prog_GNUPLOT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$GNUPLOT"; then
@@ -6644,21 +6641,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -6710,7 +6696,7 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -6811,7 +6797,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7119,7 +7104,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by frida $as_me post-2.1.3a, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -7185,7 +7170,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
frida config.status post-2.1.3a
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -7321,7 +7306,7 @@ do
"share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -7344,10 +7329,9 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -7355,13 +7339,12 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -7383,7 +7366,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -7411,7 +7394,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -7459,7 +7442,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -7491,7 +7474,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -7525,7 +7508,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -7537,8 +7520,8 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -7639,7 +7622,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -7658,7 +7641,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -7667,7 +7650,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -7693,8 +7676,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -7830,22 +7813,21 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -7856,20 +7838,20 @@ which seems to be undefined. Please make sure it is defined" >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
+ mv "$tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
diff --git a/pub/share/Makefile.am b/pub/share/Makefile.am
index 9c77242f..f6ae4c59 100644
--- a/pub/share/Makefile.am
+++ b/pub/share/Makefile.am
@@ -1,4 +1,4 @@
auxdir = $(datadir)/@PACKAGE@
-aux_DATA = g3.ps wups07a.ps
+aux_DATA = g3.ps wups07a.ps wups10a.ps wups11a.ps gnuplot-default-symbols.eps
sysconfdir = $(prefix)/etc/@PACKAGE@
sysconf_DATA = frida.ini
\ No newline at end of file
diff --git a/pub/share/Makefile.in b/pub/share/Makefile.in
index 4dc3061b..08accb2c 100644
--- a/pub/share/Makefile.in
+++ b/pub/share/Makefile.in
@@ -167,7 +167,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
auxdir = $(datadir)/@PACKAGE@
-aux_DATA = g3.ps wups07a.ps
+aux_DATA = g3.ps wups07a.ps wups10a.ps wups11a.ps gnuplot-default-symbols.eps
sysconf_DATA = frida.ini
all: all-am
diff --git a/pub/share/frida.ini b/pub/share/frida.ini
index 106a35bd..ff85e28d 100644
--- a/pub/share/frida.ini
+++ b/pub/share/frida.ini
@@ -1,6 +1,7 @@
\d psdir ~/gnew/
\d pshead /usr/local/share/frida/g3.ps
-\d psdict /usr/local/share/frida/wups10a.ps
+\d psdict /usr/local/share/frida/wups11a.ps
+\d psgsym /usr/local/share/frida/gnuplot-default-symbols.eps
\d cv_mode -1
\d cv_epsabs 1e-8
\d cv_epsrel 1e-8
diff --git a/pub/share/g3.ps b/pub/share/g3.ps
index 76e7cc34..96734077 100644
--- a/pub/share/g3.ps
+++ b/pub/share/g3.ps
@@ -24,27 +24,32 @@ originUpperLeft_A4
%% Symbols and curve styles:
F /pcol x def % black&white on/off
-{ 10 aCol1 iColA } /ipCol x bind def % number of colours and colour style
+{ 8 aCol5 iColA } /ipCol x bind def % number of colours and colour style
/pStyles [
-{ pcol { 1 1 0 1. 1. pset } { 1 1 0 1. 1. pset 0 ipCol } ifelse } % 1
-{ pcol { 1 0 0 1. 1. pset } { 1 1 0 1. 1. pset 1 ipCol } ifelse } % 3
-{ pcol { 2 1 0 1. 1. pset } { 1 1 0 1. 1. pset 2 ipCol } ifelse } % 2
-{ pcol { 2 0 0 1. 1. pset } { 1 1 0 1. 1. pset 3 ipCol } ifelse } % 4
-{ pcol { 3 1 0 1. 1. pset } { 1 1 0 1. 1. pset 4 ipCol } ifelse } % 5
-{ pcol { 3 0 0 1. 1. pset } { 1 1 0 1. 1. pset 5 ipCol } ifelse } % 6
-{ pcol { 4 1 0 1. 1. pset } { 1 1 0 1. 1. pset 6 ipCol } ifelse } % 7
-{ pcol { 4 0 0 1. 1. pset } { 1 1 0 1. 1. pset 7 ipCol } ifelse } % 8
-{ pcol { 5 1 0 1. 1. pset } { 1 1 0 1. 1. pset 8 ipCol } ifelse } % 9
-{ pcol { 5 0 0 1. 1. pset } { 1 1 0 1. 1. pset 9 ipCol } ifelse } % 10
+{ pcol { 1 1 0 1. 1. pset } { 11 0 0 1. 1. pset 0 ipCol } ifelse }
+{ pcol { 1 0 0 1. 1. pset } { 12 1 0 1. 1. pset 1 ipCol } ifelse }
+{ pcol { 2 1 0 1. 1. pset } { 13 1 0 1. 1. pset 2 ipCol } ifelse }
+{ pcol { 2 0 0 1. 1. pset } { 1 0 0 1. 1. pset 3 ipCol } ifelse }
+{ pcol { 3 1 0 1. 1. pset } { 1 1 0 .7 1. pset 4 ipCol } ifelse }
+
+{ pcol { 3 0 0 1. 1. pset } { 3 0 0 1. 1. pset 5 ipCol } ifelse }
+{ pcol { 4 1 0 1. 1. pset } { 3 1 0 .7 1. pset 6 ipCol } ifelse }
+{ pcol { 4 0 0 1. 1. pset } { 4 0 0 1. 1. pset 7 ipCol } ifelse }
+{ pcol { 5 1 0 1. 1. pset } { 4 1 0 .7 1. pset 0 ipCol } ifelse }
+{ pcol { 5 0 0 1. 1. pset } { 5 0 0 1. 1. pset 1 ipCol } ifelse }
+
+{ pcol { 5 0 0 1. 1. pset } { 5 1 0 .7 1. pset 2 ipCol } ifelse }
+{ pcol { 3 0 0 1. 1. pset } { 2 0 0 1. 1. pset 3 ipCol } ifelse }
+{ pcol { 4 1 0 1. 1. pset } { 2 1 0 .7 1. pset 4 ipCol } ifelse }
] def
T /ccol x def % black&white on/off
{ 8 aCol2 iColA } /icCol x bind def % number of colours and colour style
/cStyles [
-{ ccol { 1. [ ] lset } { 1. [] lset 0 icCol } ifelse } % 1
-{ ccol { 1. [1 3 ] lset } { 1. [] lset 1 icCol } ifelse } % 2
-{ ccol { 1. [8 6 ] lset } { 1. [] lset 2 icCol } ifelse } % 3
-{ ccol { 1. [8 3 1 3 ] lset } { 1. [] lset 3 icCol } ifelse } % 4
+{ ccol { 1. [ ] lset } { 1. [] lset 0 icCol } ifelse }
+{ ccol { 1. [1 3 ] lset } { 1. [] lset 1 icCol } ifelse }
+{ ccol { 1. [8 6 ] lset } { 1. [] lset 2 icCol } ifelse }
+{ ccol { 1. [8 3 1 3 ] lset } { 1. [] lset 3 icCol } ifelse }
] def
%% Clear frame:
diff --git a/pub/share/gnuplot-default-symbols.eps b/pub/share/gnuplot-default-symbols.eps
new file mode 100644
index 00000000..6cc51ffd
--- /dev/null
+++ b/pub/share/gnuplot-default-symbols.eps
@@ -0,0 +1,1587 @@
+%!PS-Adobe-1.0 EPSF-1.0
+%%BoundingBox: 63 551 424 616
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% FRIDA: flexible rapid interactive data analysis %%
+%% wups11a.ps: graphic macros %%
+%% (C) Joachim Wuttke 1990-2011 %%
+%% http://www.messen-und-deuten.de/frida %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Sections:
+% - Programming, Page Formatting, Coordinate Transforms
+% - Colors
+% - Fonts and Text Blocks
+% - Coordinate Frame
+% - Data Plotting (Symbols and Curves)
+% - Lists
+% - Macro Collection
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Programming, Page Formatting, Coordinate Transforms %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% Framework:
+
+% For interleaving applications, isolate what follows in a dictionary
+/WuGdict11a 400 dict def
+WuGdict11a begin
+
+
+%% Shortcuts:
+
+/np { newpath } bind def
+/mv { moveto } bind def
+/rm { rmoveto } bind def
+/rl { rlineto } bind def
+/li { lineto } bind def
+/cp { closepath } bind def
+/st { stroke } bind def
+/x { exch } bind def
+
+/black { 0 setgray } bind def
+/white { 1 setgray } bind def
+
+/F false def
+/T true def
+
+
+%% Constants:
+
+/pt { .018567 mul} bind def % for line widths and font sizes, reason unclear
+/cm {28.346456 mul} bind def % typographic_point -> cm
+
+/twopi { 6.2831853072 } def
+
+
+%% Math operators:
+
+/rnd { rand cvr 1 30 bitshift div 2 div 0 max 1 min } def % -> between 0 and 1
+
+/min { 2 copy gt { x } if pop } def
+/max { 2 copy lt { x } if pop } def
+
+/tan { dup sin x cos div } def
+/cot { dup cos x sin div } def
+/pol2xy{ 2 copy cos mul 3 1 roll sin mul } def % r phi | x y
+
+/eexp { 2.71828 x exp } def % "exp" is x^y, eexp is e^x
+/tanh { 2.71828 x 2 copy exp 3 1 roll neg exp
+ 2 copy sub 3 1 roll add div } def
+
+
+%% Page layout and global figure size:
+
+% shift origin
+% The PostScript coordinate system starts in the lower left corner
+% of the page, whereas we want our figures to be justified in the
+% upper left corner. Therefore we need a vertical translation,
+% depending on the paper size. A4 is 210x297 mm^2. By this occasion,
+% we also provide a border of 7 mm.
+/cmtranslate { % x y cmtranslate | -
+ cm x cm x translate } bind def
+/originUpperLeft_A4{ .7 28.3 cmtranslate } bind def
+/EdgeLeftDIN{ originUpperLeft_A4 } bind def % OBSOLETE since 11a
+
+% set absolute global scale and relative symbol size
+/defsiz { % size(cm) symbolsize(rel) | -
+ /ftot x def
+ cm 10 div dup scale % within 'size', coordinates run from 0 to 10
+ } def
+
+% symbol (and label?) size as sublinear function of figure size
+/autolabel { % size(cm) | symbolsize(rel)
+ dup 7 div 2 add 4 mul % the simplest sublinear increase
+ x div % anticipate overall rescaling
+ } def
+
+
+%% Frame size and shape, frame coordinates:
+
+% aspect ratios
+/gyld {0.447214 mul} bind def /Gyld {0.447214 div} bind def % sqrt(5)
+/guld {0.547723 mul} bind def /Guld {0.547723 div} bind def % sqrt(3)
+/gold {0.618034 mul} bind def /Gold {0.618034 div} bind def % goldener Schnitt
+/gild {0.707107 mul} bind def /Gild {0.707107 div} bind def % sqrt(2) : DIN
+/geld {0.759836 mul} bind def /Geld {0.759836 div} bind def % sqrt(sqrt(3))
+/gald {0.817765 mul} bind def /Gald {0.817765 div} bind def % sqrt sqrt sqrt 5
+
+% define frame coordinates
+/defred { % x_reduction y_reduction label_reduction | -
+ /fmm x ftot mul def
+ /ymm x def
+ /xmm x def
+
+ % conversion frame_coordinate -> global_coord
+ /xm {xmm mul} bind def
+ /ym {ymm mul} bind def
+ /fm {fmm mul} bind def
+ /xym {ym x xm x} bind def
+
+ % prefer rescaling over explicit conversion (make more use of this !)
+ /mmscale { xmm ymm scale } bind def
+ /mmunscale { 1 xmm div 1 ymm div scale } bind def
+
+ % graphic commands in frame coordinates
+ /offset { xym translate } bind def
+ /currentxy { currentpoint ymm div x xmm div x } bind def
+ /setline { pt fm setlinewidth [] 0 setdash } bind def
+ } def
+
+/stdred { % x_reduction y_reduction | -
+ 2 copy mul sqrt defred
+ } def
+
+%% World (= user application) coordinates:
+
+% user must declare x and y range
+/xSetCoord { % log min max | -
+ /wxmax x def
+ /wxmin x def
+ /wxlog x 0 eq not def
+ % prepare conversion world coord -> frame coord
+ /wxdel wxmax wxmin wxlog { div log } { sub } ifelse def
+ /wxd { % dx(world) | dx(frame)
+ wxlog { log } if wxdel div 10 mul
+ } bind def
+ /wx { % x(world) | x(frame)
+ wxmin wxlog { div } { sub } ifelse
+ wxd
+ } bind def
+ } def
+/ySetCoord { % log min max | -
+ /wymax x def
+ /wymin x def
+ /wylog x 0 eq not def
+ /wydel wymax wymin wylog { div log } { sub } ifelse def
+ /wyd { % dy(world) | dy(frame)
+ wylog { log } if wydel div 10 mul
+ } bind def
+ /wy { % y(world) | y(frame)
+ wymin wylog { div } { sub } ifelse
+ wyd
+ } bind def
+ } def
+
+% pair conversion
+/wxy { % x,y(world) -> x,y(frame)
+ wy x wx x
+ } def
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Colors %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% Color operators:
+
+/setRGBcolor {
+ 3 { 255 div 3 1 roll } repeat setrgbcolor
+ } def
+
+/colormix { % weight(0..1) col1(R|G|B) col2(R|G|B) | col(R|G|B)
+ 7 -1 roll dup /weightA x def /weightB x 1 x sub def
+ 4 -1 roll weightA mul x weightB mul add 5 1 roll
+ 3 -1 roll weightA mul x weightB mul add 4 1 roll
+ 2 -1 roll weightA mul x weightB mul add 3 1 roll
+ } def
+
+/relcol { % i_col n_col | rel(0..1) : for one-dimensional choices
+ 1 sub div 0 max 1 min
+ } def
+
+
+%% Named colors:
+
+/siemensorange { 255 153 0 setRGBcolor } bind def
+/siemensblue { 0 102 153 setRGBcolor } bind def
+/siemenstext { 0 51 102 setRGBcolor } bind def
+/siemensred { 165 0 33 setRGBcolor } bind def
+/siemenspink { 221 102 102 setRGBcolor } bind def
+/siemensgrey { 221 221 221 setRGBcolor } bind def
+/siemensdark { 102 102 102 setRGBcolor } bind def
+/siemensgreen { 33 153 102 setRGBcolor } bind def
+/siemensyellow { 255 221 0 setRGBcolor } bind def
+
+/red { 255 0 0 setRGBcolor } bind def
+
+
+%% One-dimensional linear color choices:
+
+/iCol1 { % i i_max | - : default -2010, round the circle, RGBR
+ relcol dup 1 x % rel 1 rel
+ 360 mul 255 add cos 1 add dup mul neg .053 mul 1 add % modulate saturation
+ sethsbcolor
+ } def
+/iCol2 { % i i_max | - : cyan - yellow - magenta
+ relcol 3 mul
+ dup 1 le {
+ dup 1 sub neg 0 3 2 roll } {
+ dup 2 le {
+ 1 sub dup 1 sub neg 0 3 1 roll } {
+ 2 sub dup 1 sub neg 0 3 0 roll } ifelse
+ } ifelse
+ 0 setcmykcolor
+ } def
+/iCol3 { % i i_max | - : siemens
+ div /icnow x def
+ 165 1 icnow sub mul
+ 102 icnow mul
+ 33 120 icnow mul add setRGBcolor
+ } def
+/iCol4 { % i i_max | - : red to blue (subsequence of old scheme iCol1)
+ relcol
+ 3 x sub 3 div 1 iCol1
+ } def
+
+
+%% One-dimensional color choice from given array:
+
+/iColA { % i i_max arr | -
+ /aCol x def
+ relcol
+ aCol length 1 sub mul % position within array
+ dup cvi dup 3 1 roll % idx pos idx
+ sub x % offset idx
+ 0 max aCol length 1 sub min % offset safe_idx
+ dup 1 add aCol length 1 sub min % offset i i+1
+ aCol x get exec
+ 4 3 roll aCol x get exec colormix setRGBcolor
+ } def
+
+
+%% Color arrays for non-linear one-dimensional choices:
+
+/aCol1 [ % red-blue
+ { 255 0 0 } % 1
+ { 240 10 10 } % 2
+ { 220 40 40 } % 3
+ { 205 65 90 } % 4
+ { 195 80 130 } % 5
+ { 180 110 180 } % 6
+ { 165 120 185 } % 7
+ { 150 130 190 } % 8
+ { 130 150 210 } % 9
+ { 110 125 220 } % 10
+ { 85 105 230 } % 11
+ { 70 90 255 } % 12
+ { 0 0 255 } % 13
+ ] def
+/aCol2 [ % orange-red-blue-darkblue
+ { 255 180 0 } % 1
+ { 255 160 0 } % 1
+ { 255 120 0 } % 2
+ { 255 70 0 } % 3
+ { 255 0 0 } % 4
+ { 220 30 30 } % 5
+ { 220 70 60 } % 6
+ { 220 100 110 } % 7
+ { 200 130 130 } % 8
+ { 200 130 160 } % 9
+ { 180 110 180 } % 10
+ { 165 110 185 } % 11
+ { 150 130 190 } % 12
+ { 130 150 210 } % 13
+ { 100 120 220 } % 14
+ { 85 105 230 } % 15
+ { 70 90 255 } % 16
+ { 0 0 255 } % 17
+ { 0 0 180 } % 18
+ { 10 10 150 } % 19
+ { 30 30 130 } % 20
+ ] def
+/aCol3 [ % siemenscolors
+ { 221 102 102 } % siemenspink
+ { 165 0 33 } % siemensred
+ { 255 153 0 } % siemensorange
+ { 255 221 0 } % siemensyellow
+ { 33 153 102 } % siemensgreen
+ { 0 102 153 } % siemensblue
+ { 0 51 102 } % siemenstext
+ { 102 102 102 } % siemensdark
+ { 221 221 221 } % siemensgrey
+ ] def
+/aCol4 [ % green-blue-brown
+ { 120 160 60 }
+ { 90 185 40 }
+ { 50 215 20 }
+ { 0 245 0 }
+ { 10 235 112 }
+ { 20 235 143 }
+ { 30 230 173 }
+ { 40 225 194 }
+ { 50 205 215 }
+ { 40 153 204 }
+ { 40 102 153 }
+ { 40 82 122 }
+ { 90 74 101 }
+ { 140 68 80 }
+ { 170 59 60 }
+ { 190 50 40 }
+ { 180 65 40 }
+ { 160 80 40 }
+ { 140 100 40 }
+ { 120 80 30 }
+ { 100 60 20 }
+ ] def
+/aCol5 [ % gnuplot default (see man gnuplot and rgb.txt)
+ { 255 0 0 } % red
+ { 0 255 0 } % green
+ { 0 0 255 } % blue
+ { 255 0 255 } % magenta
+ { 0 255 255 } % cyan
+ { 160 82 45 } % sienna
+ { 255 165 0 } % orange
+ { 255 127 80 } % coral
+ ] def
+
+
+%% Specialized ifelse, depending on pcol / ccol - OBSOLETE since 11a:
+
+/ifpcol { % proc1 proc2 | -
+ pcol 0 eq { pop exec } { exec pop} ifelse % 3 1 roll ifelse
+ } def
+/ifccol { % proc1 proc2 | -
+ ccol 0 eq { pop exec } { exec pop} ifelse % 3 1 roll ifelse
+ } def
+
+
+%% old-style colors round the circle - OBSOLETE since 10a:
+
+% global preset
+/pColSet { % col ncol | -
+ /npcol x def % # different colours
+ /pcol x def % colours off/on
+ } def
+/cColSet { % col ncol | -
+ /nccol x def % # different colours
+ /ccol x def % colours off/on
+ } def
+% default setting
+0 3 pColSet % default setting
+0 3 cColSet % default setting
+% now defined locally in g3.ps
+/ipCol { 100 iCol1 } def
+/icCol { 100 iCol1 } def
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Fonts and Text Blocks %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% Prepare standard fonts:
+
+% extend font encoding
+/ReEncode { % OldFont NewFont Encoding | -
+ /MyEncoding x def
+ x findfont % select OldFont
+ dup length dict begin
+ {def} forall
+ /Encoding MyEncoding def
+ currentdict
+ end
+ definefont % define as NewFont
+ } def
+
+% we assume that image scripts are Latin1 encoded
+/Helvetica /HelveticaLatin1 ISOLatin1Encoding ReEncode
+/Helvetica-Oblique /HelveticaLatin1-Oblique ISOLatin1Encoding ReEncode
+/Helvetica-Bold /HelveticaLatin1-Bold ISOLatin1Encoding ReEncode
+/Helvetica-BoldOblique /HelveticaLatin1-BoldOblique ISOLatin1Encoding ReEncode
+
+
+%% Preset standard styles:
+
+% scale and set font; define fontsize, fontheight
+/setfontandsize { % font size | -
+ dup 0 le { pop 100 } if % fontsize <= 0 not allowed !
+ /fontnonnil true def
+ pt fm dup /fontsize x def
+ x findfont
+ x scalefont
+ setfont
+ gsave % determine fontheight - from the cookbook :
+ np 0 0 mv (1) true charpath flattenpath
+ pathbbox % low_left_x, low_left_y, up_right_x, up_right_y
+ x pop x pop x pop
+ /fontheight x def
+ grestore
+ } def
+
+% standard settings for labelling axes
+/setnum { /HelveticaLatin1 24 setfontandsize } bind def
+/setlab { /HelveticaLatin1 24 setfontandsize } bind def
+
+% user commands (free choice of fontsize, but fixed font family)
+/setown { /HelveticaLatin1 x setfontandsize } bind def
+/setbol { /HelveticaLatin1-Bold x setfontandsize } bind def
+/setboq { /HelveticaLatin1-BoldOblique x setfontandsize } bind def
+/setobl { /HelveticaLatin1-Oblique x setfontandsize } bind def
+
+
+%% String treatment:
+
+/showif { % string | - : increment xwidth or plot string
+ prepare
+ { stringwidth pop xwidth add /xwidth x def }
+ { show }
+ ifelse
+ } def
+/script { % matrix relpos_y | -
+ /yoffset x fontheight mul def
+ currentfont x makefont setfont
+ 0 yoffset rm
+ } def
+/scred .71 def
+/subsc {
+ showif
+ [scred 0 0 scred 0 0] -.2 script
+ } def
+/supsc {
+ showif
+ [scred 0 0 scred 0 0] .6 script
+ } def
+/endsc {
+ showif
+ regularfont setfont
+ 0 yoffset neg rm
+ } def
+/grec {
+ showif
+ /Symbol findfont fontsize scalefont setfont
+ } def
+/endgr {
+ showif
+ regularfont setfont
+ } def
+/endall {
+ showif
+ regularfont setfont
+ } def
+/build { % string xrel yrel obj | - : plot obj above/below string
+ /obj x def /yrelbui x def /xrelbui x def
+ dup showif
+ prepare
+ { pop }
+ { stringwidth pop xrelbui neg mul fontheight yrelbui mul % relpos for obj
+ currentpoint 4 2 roll % save position after string
+ rm obj pop % obj must end with () that will be pop'ed
+ mv % back to saved position
+ }
+ ifelse
+ } def
+/gbuild { % string xrel yrel obj | - : plot obj above/below string
+ /obj x def /yrelbui x def /xrelbui x def
+ /Symbol findfont fontsize scalefont setfont
+ dup showif
+ prepare
+ { pop regularfont setfont }
+ { stringwidth pop xrelbui neg mul fontheight yrelbui mul % relpos for obj
+ currentpoint 4 2 roll % save position after string
+ regularfont setfont
+ rm obj pop % obj must end with () that will be pop'ed
+ mv % back to saved position
+ }
+ ifelse
+ } def
+/hut { % ..) (<Char>) hut (.. %%% MISERABEL PROGRAMMIERT
+ x showif
+ 1.4 .6 {(\136) show ()} build
+ } def
+/ghut { % ..) (<grec-Char>) ghut (.. %%% BREITE PASST NUR FUER Phi(t)
+ x showif
+ .8 .65 {(\136) show ()} gbuild
+ } def
+/tilde {
+ x showif
+ 1. .6 {(~) show ()} build
+ } def
+/gtilde {
+ x showif
+ 1. .6 {(~) show ()} gbuild
+ } def
+/spce { % string n spce - ; insert n times ( )
+ {showif ( )} repeat
+ } def
+
+% the following macros use the symbol/curve plotting mechanism
+/pins { % string symins - ; symbol must be selected by pset
+ showif
+ ( ) showif ( ) .5 .5 { currentxy 0 p black ()} build ( ) showif
+ } def
+/clenins { % string len clenins - ; curve must be selected by cset
+ x showif % I suppose that pins is preceeded by 8 spaces
+ dup ( ) stringwidth pop mul 2 add /xstrich x xmm div def
+ % length of inserted curve :
+ % -1 space : curve begins and ends in middle of ( )
+ % +3 spaces: pins requires 3 times ( )
+ ( ) 0 .5 { currentxy currentxy 0 ci x xstrich add x 0 cf () } build
+ 2 add {( ) showif} repeat
+ } def
+/cins { % string symins - ; curve must be selected by cset
+ showif 8 % I suppose that pins is preceeded by 8 spaces
+ dup ( ) stringwidth pop mul 2 add /xstrich x xmm div 10 div def
+ % nov03, ohne zu verstehen, "10 div" eingefuegt
+ % length of inserted curve :
+ % -1 space : curve begins and ends in middle of ( )
+ % +3 spaces: pins requires 3 times ( )
+ ( ) 0 .5 { currentxy currentxy 0 ci x xstrich add x 0 cf () } build
+ 2 add {( ) showif} repeat
+ } def
+
+/block { % x y ob xrel yrel | -
+ /yrel x def /xrel x def /blabla x def
+ /ypos x ym def /xpos x xm def
+ /regularfont currentfont def /yoffset 0 def % initialize for security
+ /prepare true def /xwidth 0 def 0 0 mv % to prevent empty-path-error
+ blabla endall % first pass : determine xwidth
+ boxif { /boxwidth xwidth (M) stringwidth pop boxxr mul 2 mul add def
+ /boxheight fontheight 1 boxyr 2 mul add mul def
+ np xpos xwidth xrel mul sub boxwidth xwidth sub 2 div sub
+ ypos fontheight .5 boxyr add mul sub mv
+ boxwidth 0 rl 0 boxheight rl boxwidth neg 0 rl cp
+ boxproc
+ } if
+ xpos xwidth xrel mul sub ypos fontheight yrel mul sub mv
+ /prepare false def
+ blabla endall % second pass : plot
+ /boxif false def
+ } def
+/rblock { % x y ang ob proc rblock -
+ 5 3 roll
+ gsave
+ xym translate
+ 3 2 roll rotate
+ 0 0 4 2 roll exec
+ grestore
+ } def
+
+/Box { % x y {exe}
+ /boxif true def
+ /boxproc x def /boxyr x def /boxxr x def
+ } def
+/nBox { .6 .6 3 2 roll Box } def
+/boxif false def
+/textW { % obj textW y : calculate only length.
+ /blabla x def
+ /regularfont currentfont def /yoffset 0 def % initialize for security
+ /prepare true def /xwidth 0 def 0 0 mv % to prevent empty-path-error
+ blabla endall
+ xwidth % has been determined
+ } def
+/textw { % obj textW y : dito, in 0..10-units
+ textW xmm div
+ } def
+
+% horizontal text: x y ob | -
+/textLB { 0. 0. block } bind def
+/textCB { .5 0. block } bind def
+/textRB { 1. 0. block } bind def
+/textLM { 0. .5 block } bind def
+/textCM { .5 .5 block } bind def
+/textRM { 1. .5 block } bind def
+/textLT { 0. 1. block } bind def
+/textCT { .5 1. block } bind def
+/textRT { 1. 1. block } bind def
+
+% rotated text: x y ang ob | -
+/rtextLB { {textLB} rblock } bind def
+/rtextLM { {textLM} rblock } bind def
+/rtextRB { {textRB} rblock } bind def
+/rtextRM { {textRM} rblock } bind def
+/rtextCM { {textCM} rblock } bind def
+
+
+%% Language selection:
+
+% preset
+/language { % choose_this of_so_many | - % select current language
+ /langMax x def
+ /langChc x def
+ } def
+1 1 language % default
+% choose text from sequence
+/langSel { % text_1 .. text_M | text_C : choose text, M=langMax, C=langChc
+ langMax dup langChc sub 1 add roll
+ langMax 1 sub { pop } repeat
+ } def
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Coordinate Frame %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% Layout presets:
+
+/xyTicLen {0.10 fm} def
+/xyTacLen {0.20 fm} def
+/txllen {0.20 fm} def
+/tyllen {0.20 fm} def
+/linsetAxx {black 0.7 setline} def
+/linsetTic {black 0.7 setline} def
+/linsetTac {black 0.7 setline} def
+/linsetGri {black 0.4 setline} def
+
+%% Start-up commands:
+
+/Resets {
+ /yNumLengthL 0 def /yNumLengthH 0 def
+ /xNumHeightL .3 def /xNumHeightH 0 def
+ /xNumHeightRel 2.4 def
+ /aMean 5 def
+ /xPlotFrame {} def
+ /yPlotFrame {} def
+ /zPlotFrame {} def
+ black
+ } def
+/BoxBackground {
+ 0 0 10 10 boxit gsave setboxbackgroundcolor fill grestore
+} def
+/setboxbackgroundcolor { white } def
+
+
+%% Some more presets for g3.ps:
+
+/zValues { pop pop } def
+/plotafter {} def
+/whiteframe { 1 0 0 10 10 graybox } def
+/plotframes { xPlotFrame yPlotFrame } def
+/plotbefore { plotframes } def
+
+/abc {abclab setown abcx abcy 3 2 roll textCM} def % usage ((a)) abc
+/abcset { % x y siz abcset - : preset for abc
+ /abclab x def /abcy x def /abcx x def
+ } def
+
+
+%% Ticks:
+
+% set tick array - internal macros
+/tiputs { % rel_pos_of_tick | pos_of_tick : innermost routine for /taproc
+ tastep mul taloop add
+ } def
+/taproclin { % (#tick/tack) | - : define /taproc for use in SetVec
+ 1 x div /tistep x def
+ /taproc { 0 tistep .999 { tiputs } for } def
+ } def
+/taproclog { % (#ticks/tacks) | - : define /taproc for use in SetVec
+ dup 3 gt { pop /taproc { 1 1 9 { log tiputs } for } def
+ }{ dup 1 gt { pop /taproc { 0 tiputs 2 log tiputs 5 log tiputs } def
+ }{ dup 0 gt { pop /taproc { 0 tiputs } def
+ }{ neg taproclin
+ } ifelse } ifelse } ifelse
+ } def
+/SetVec { % tafro tatoo nta /vector | - : set /vector
+ 4 1 roll
+ /nta x def /tatoo x def /tafro x def
+ /tastep tatoo tafro sub nta 1 sub div def
+ [
+ 0 1 nta {
+ tastep mul tafro add /taloop x def
+ taproc exec
+ } for
+ ] def
+ } def
+% set tick array - user commands
+/SetTicVecLin { taproclin /TicVec SetVec } def
+/SetTicVecLog { taproclog /TicVec SetVec } def
+
+% set tack-and-number array
+/SetTacVec { % [ pos {label} pos {label} ... ] | -
+ /TacVec x def
+ } def
+
+% define axes
+ % note on angles : 0 = x-axis, 90 = y-axis
+/OneAxx { % fro to xpos ypos aang tang | - : presets for Axx, Tic, Tac, Num
+ % store arguments
+ /tAng x def /aAng x def
+ /yPos x def /xPos x def
+ /aTo x def /aFro x def
+ % set constants
+ /xTicLen tAng cos xyTicLen mul def /yTicLen tAng sin xyTicLen mul def
+ /xTacLen tAng cos xyTacLen mul def /yTacLen tAng sin xyTacLen mul def
+ /xAng aAng cos def /yAng aAng sin def
+ /aMean aFro aTo add 2 div def
+ /aArr false def
+ } def
+/ArrAxx { % label <args of OneAxx> | - : axis with arrow
+ OneAxx
+ /aLab x def
+ /aArr true def
+ } def
+
+% draw axis (with parameters preset by OneAxx or ArrAxx)
+/Axx { % - | -
+ linsetAxx
+ gsave
+ xPos yPos offset
+ mmscale
+ aAng rotate
+ % draw a line
+ aFro 0 np mv
+ aTo 0 li st
+ % draw an arrow and a label, if requested
+ aArr {
+ gsave
+ aTo 0 offset
+ aAng neg rotate
+ mmunscale
+ aAng rotate
+ 0 0 0 .3 pfeilspitze % draw an arrow
+ .3 0 offset
+ aAng neg rotate
+ setlab
+ aAng 45 le
+ { 0 -.8 xNumHeightL sub aLab textRT }
+ { 0 .2 aLab textCB }
+ ifelse
+ grestore
+ } if
+ grestore
+ } def
+
+% draw ticks (positions given by SetTicVec, parameters preset by OneAxx/..)
+/Tic { % - | - : draw tick as defined in TicProc
+ linsetTic
+ TicVec {
+ dup dup aFro lt x aTo gt or {pop} {TicProc} ifelse
+ } forall
+ } def
+/TicProc { % aPos | - : default procedure to plot one tick
+ np
+ xPos yPos xym mv
+ dup xAng mul x yAng mul xym rm % eat argument, go to start pos.
+ xTicLen yTicLen rl st
+ } def
+/xGric { % yFro yTo | - : draw a grid line (instead of an x tick)
+ linsetGri
+ TicVec {
+ 3 copy dup 5 -1 roll aFro lt x aTo gt or {pop pop pop} {
+ dup % y1 y2 x x
+ 4 -1 roll xym np mv % y2 x
+ x xym li st
+ } ifelse
+ } forall
+ pop pop
+ } def
+/yGric { % xFro xTo | - : draw a grid line (instead of an y tick)
+ linsetGri
+ TicVec {
+ 3 copy dup 5 -1 roll aFro lt x aTo gt or {pop pop pop} {
+ dup % x1 x2 y y
+ 4 -1 roll x xym np mv % x2 y
+ xym li st
+ } ifelse
+ } forall
+ pop pop
+ } def
+
+% draw tacks (positions given by SetTacVec, parameters preset by OneAxx/..)
+/TacExe { % Proc | - % Execute Proc for all pairs of elements of TacVec
+ % (but only if inside aFro..aTo)
+ /TacProc x def
+ /ispair true def % toggle: take pos, take label, take pos, take label ...
+ TacVec {
+ ispair
+ {
+ /aPos x def
+ /ispair false def
+ } {
+ aPos dup aFro lt x aTo gt or
+ {pop} {TacProc} ifelse
+ /ispair true def
+ } ifelse
+ } forall
+ } def
+/Tac {
+ linsetTac
+ { pop xPos yPos xym mv
+ aPos dup xAng mul x yAng mul xym rm
+ xTacLen yTacLen rl st
+ } TacExe
+ } def
+% unnecessary optimisation by specialisation: OBSOLETE since 11a
+/xTacL { Tac } def
+/xTacH { Tac } def
+/yTacL { Tac } def
+/yTacH { Tac } def
+% special tack routines, only for rectangular axes
+/xTacC { % : centered tack on x axis
+ linsetTac
+ { pop aPos xm yPos ym txllen 2 div sub np mv 0 txllen rl st } TacExe
+ } def
+/xGrid { % : rule instead of tack on x axis
+ linsetTac
+ { pop aPos xm np yPos ym mv 0 10 xym rl st } TacExe
+ } def
+/yTacC { % : centered tack on y axis
+ linsetTac
+ { pop xPos xm tyllen 2 div sub aPos ym np mv tyllen 0 rl st } TacExe
+ } def
+/yGrid { % : rule instead of tack on low y axis
+ linsetTac
+ { pop aPos ym np xPos xm x mv 10 0 xym rl st } TacExe
+ } def
+
+% draw numbers (pos-txt pairs given by SetTacVec)
+/Num { % Generic but useless. Adjust for your application.
+ setnum
+ fontheight ymm div yDisRel mul tAng sin mul /yDist x def
+ { dup textW xDisRel mul tAng cos mul /xDist x def
+ xPos aPos xAng mul add xDist sub
+ yPos aPos yAng mul add yDist sub 3 2 roll textCM } TacExe
+ } def
+/setnumDisRel { % xDisRel yDisRel | - : adjust just a little bit
+ /yDisRel x def /xDisRel x def
+ } def
+1.2 1.2 setnumDisRel % default setting
+% explicit Num routines for rectangular case
+/xNumL { % : numbers on low x axis
+ setnum
+ { fontheight ymm div % conversion -> user_scale
+ dup /xNumHeightL x def
+ -.6 mul yPos add aPos x 3 2 roll textCT } TacExe
+ } def
+/xNumH { % : numbers on high x axis
+ setnum
+ { fontheight ymm div % conversion -> user_scale
+ dup /xNumHeightH x def
+ .6 mul yPos add aPos x 3 2 roll textCB } TacExe
+ } def
+/yNumL { % : numbers on low y axis
+ setnum
+ { fontsize -.3 mul xmm div xPos add aPos 3 2 roll textRM
+ xwidth dup yNumLengthL gt {/yNumLengthL x def} {pop} ifelse
+ } TacExe
+ } def
+/yNumLD { % : calculate only yNumLength (used for adjustement)
+ setnum
+ { textW dup yNumLengthL gt {/yNumLengthL x def} {pop} ifelse
+ } TacExe
+ } def
+/yDumL { % {(..)} yDumL : compare yNumLength with one arg (used for adjustement)
+ setnum
+ textW dup yNumLengthL gt {/yNumLengthL x def} {pop} ifelse
+ } def
+/yNumH { % : numbers on high y axis
+ setnum
+ { fontsize .3 mul xmm div xPos add aPos 3 2 roll textLM
+ xwidth dup yNumLengthH gt {/yNumLengthH x def} {pop} ifelse
+ } TacExe
+ } def
+/yNumHD { % : calculate only yNumLength (used for adjustement)
+ setnum
+ {textW dup yNumLengthH gt {/yNumLengthH x def} {pop} ifelse
+ } TacExe
+ } def
+/yDumH { % {(..)} yDumH : compare yNumLength with one arg (used for adjustement)
+ setnum
+ textW dup yNumLengthH gt {/yNumLengthH x def} {pop} ifelse
+ } def
+
+% draw labels
+/xCL { % xlabel | - ; plots coordinate name below the x-axis.
+ setlab
+ aMean xNumHeightL xNumHeightRel neg mul
+ 3 -1 roll textCT
+ } def
+/xCH { % xlabel | - ; plots coordinate name above the x-axis.
+ setlab
+ aMean xNumHeightH xNumHeightRel mul 10 add
+ 3 -1 roll textCB
+ } def
+/yCL { % ylabel | - ; plots coordinate name to the left of the y-axis.
+ gsave
+ setlab
+ yNumLengthL neg fontsize -.85 mul add % yNumLengthL calculated in yN
+ aMean ym translate
+ 0 0 mv
+ 90 rotate
+ 0 x 0 x textCB
+ grestore
+ } def
+/yCH { % ylabel | - ; plots coordinate name to the right of the y-axis.
+ gsave
+ setlab
+ yNumLengthH fontsize .85 mul add 10 xm add
+ aMean ym translate
+ 0 0 mv
+ 90 rotate
+ 0 x 0 x textCT
+ grestore
+ } def
+/yCF { % ylabel | - ; plots coordinate name *falling* right of the y-axis.
+ gsave
+ setlab
+ yNumLengthH fontsize .85 mul add 10 xm add
+ aMEan ym translate
+ 0 0 mv
+ -90 rotate
+ 0 x 0 x textCB
+ grestore
+ } def
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Data Plotting (Symbols and Curves) %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% Initializations:
+
+% asymmetric error bars?
+/err_asy false def % overwrite this if data are quadruples x y d- d+
+
+
+%% Presets:
+
+% global preset [wups11a: exchanged rad<->lin to conform with pset]
+/SymGSet { % sradglo slinglo serrglo | -
+ /serrglo x def % plot error bars? 0=never, 1=always, 2=as_given_in_pset
+ /slinglo x def % symbol linewidth multiplier
+ /sradglo x def % symbol size multiplier
+ } def
+
+
+%% Retrieve presets from style array:
+
+/pstyle { pStyles setstyle } def
+/cstyle { cStyles setstyle } def
+/setstyle { % chosen_number array | - : set p or c as predefined in array.
+ dup length % i A n
+ 3 2 roll % A n i
+ dup 0 le {
+ pop pop pop ostyle % chosen_number<=0 means: don't plot
+ } {
+ 1 sub x % A i-1 n
+ mod get % A(i-1)
+ exec
+ } ifelse
+ } def
+
+
+%% Set plot symbol:
+
+/pset { % styp sfill serr srad slin | -
+ % arg -> symbol linewidth
+ /slin x slinglo mul def
+ % arg -> symbol size
+ /srad x fm 0.16 mul sradglo mul def
+ % arg -> plot error bar?
+ 2 serrglo ne { pop serrglo } if % if (serrglo=2) use serr else use serrglo
+ /plot_errorbar x 1 eq { { errorbar } } { { pop pop pop pop } } ifelse def
+ % arg -> fill the symbol? (0=open, 1=full, 2=colored_with_black_border)
+ /sfill x def
+ % adjust srad: it's the _outer_ radius
+ % TROUBLE sfill 1 ne {/srad srad slin fm pt sub def} if
+ % arg -> symbol type
+ /ps {pop pop} def % default: don't plot (maybe we only want an error bar)
+ dup 1 eq {/ps {ps_square} def} if
+ dup 2 eq {/ps {ps_diamond} def} if
+ dup 3 eq {/ps {ps_circle} def} if
+ dup 4 eq {/ps {ps_triangle} def} if
+ dup 5 eq {/ps {ps_cedez} def} if
+ dup 6 eq {/ps {ps_eieruhr} def} if
+ dup 7 eq {/ps {ps_valve} def} if
+ dup 8 eq {/ps {ps_tfwd} def} if
+ dup 9 eq {/ps {ps_tbwd} def} if
+ dup 10 eq {/ps {ps_penta} def} if
+ dup 11 eq {/ps {ps_plus} def} if
+ dup 12 eq {/ps {ps_cross} def} if
+ dup 13 eq {/ps {ps_star} def} if
+ pop
+ %
+ /t { % x y d[- d+] | - : plot a symbol and eventually an error bar.
+ err_asy not { dup } if
+ 4 copy pop pop plot_symbol
+ plot_errorbar
+ } bind def
+ /ti { t } bind def
+ /tf { t black } bind def
+ } def
+
+
+%% Set curve:
+
+/lset { % lwidth dashes | -
+ 0 setdash
+ dup 0 gt {
+ pt fm setlinewidth
+ % pop error bar and convert frame coord -> paper coord
+ /txy { err_asy { pop } if pop xym } def % x y d[- d+] | x' y'
+ % commands to plot points (can be overwritten by nopoints):
+ /ti { np txy mv } def % x y d[- d+] | - : start curve
+ /t { txy li } def % x y d[- d+] | - : continue curve
+ /tf { txy li st } def % x y d[- d+] | - : terminate and plot curve
+ } {
+ ostyle
+ } ifelse
+ } def
+
+
+%% Plot nothing:
+
+/ostyle { % - | -
+ /ti { nopoint } def
+ /t { nopoint } def
+ /tf { nopoint } def
+} def
+/nopoint { % x y d[- d+] | -
+ pop pop pop err_asy { pop } if
+} def
+
+
+%% Plot an asymmetric vertical error bar:
+
+/errorbar { % x y d- d+ | -
+ 3 copy pop pop
+ dup 0 gt x 10 lt and {
+ 4 copy
+ x pop add 10. 2 copy gt { x } if pop ym x xm x
+ 2 copy x .05 sub x np mv .1 0 rl st
+ np mv
+ pop sub 0. 2 copy lt { x } if pop ym x xm x
+ 2 copy lineto st
+ x .05 sub x np mv .1 0 rl st
+ } {
+ pop pop pop pop
+ } ifelse
+ } def
+
+
+%% Plot a data symbol:
+
+/plot_symbol { % x y | -
+ gsave
+ offset
+ srad dup scale
+ slin srad div setline % Faktor 1/div unverstanden, aber noetig
+ ps % the actual plot symbol, defined by 'pset'
+ grestore
+ } def
+
+/fill_symbol {
+ sfill dup
+ 0 eq {
+ pop st
+ } {
+ 1 eq {
+ fill
+ } {
+ gsave fill grestore
+ gsave black st grestore
+ } ifelse
+ } ifelse
+ } def
+
+
+%% The different symbols, designed for unit area (no arguments):
+
+/ps_square {
+ .5 .5 np mv
+ 0 -1 rl
+ -1 0 rl
+ 0 1 rl cp fill_symbol
+ } bind def
+
+/ps_diamond {
+ gsave 45 rotate ps_square grestore
+ } bind def
+
+/ps_circle {
+ 0 0 np .564 0 360 arc cp fill_symbol
+ } bind def
+
+/ps_triangle {
+ .77 dup dup 90 pol2xy np mv
+ 210 pol2xy li
+ 330 pol2xy li cp fill_symbol
+ } bind def
+
+/ps_cedez {
+ gsave 180 rotate ps_triangle grestore
+ } bind def
+
+/ps_tfwd {
+ gsave 30 rotate ps_triangle grestore
+ } bind def
+
+/ps_tbwd {
+ gsave 210 rotate ps_triangle grestore
+ } bind def
+
+/ps_eieruhr {
+ -.7 -.7 np mv
+ .7 -.7 li
+ -.7 .7 li
+ .7 .7 li cp fill_symbol
+ } bind def
+
+/ps_valve {
+ gsave 90 rotate ps_eieruhr grestore
+ } bind def
+
+/ps_penta {
+ .94 dup dup dup dup
+ 90 pol2xy np mv
+ 234 pol2xy li
+ 18 pol2xy li
+ 162 pol2xy li
+ 306 pol2xy li cp fill_symbol
+ } bind def
+
+/ps_plus {
+ gsave 45 rotate ps_cross grestore
+ } bind def
+
+/ps_cross {
+ .5 .5 np mv
+ -1 -1 rl st
+ -.5 .5 np mv
+ 1 -1 rl st
+ } bind def
+
+/ps_star {
+ .7 dup 0 pol2xy np mv 180 pol2xy li st
+ .7 dup 120 pol2xy np mv 300 pol2xy li st
+ .7 dup 240 pol2xy np mv 60 pol2xy li st
+ } bind def
+
+
+%% Set column plotting (use this instead of pset) - BROKEN in 11a or earlier
+
+/setcolumn{ % shift width exec | %
+ % usage: 0 .2 { gsave { .5 setgray fill } grestore cp } setcolumn
+ /colexec x def % what's this ?
+ /colwidth x def
+ /colshift x def
+ /t { % broken - may need rewrite
+ np x colshift add x xym 2 copy mv pop
+ colwidth xm 0 rl
+ colwidth xm add 0 wy ym li
+ colwidth neg xm 0 rl
+ cp colexec
+ } def
+ /ti { t } bind def
+ /tf { t black } bind def
+} def
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% List %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+/NewList { % xins yins size advance NewList -
+ /nl_advance x def setown /nl_yins x def /nl_xins x def
+ /nl_xshift fontsize xmm div .9 mul def
+ /nl_xrline 0.33 def
+ /nl_ystep fontheight ymm div nl_advance mul def
+ /newline {
+ /nl_yins nl_yins nl_ystep sub def
+ } def
+ /fracline { % frac | -
+ fontheight ymm div nl_advance mul mul /nl_yins x nl_yins x sub def
+ } def
+ } def
+/newlist { 1.65 NewList } def
+/TxLine { % text TxLine -
+ nl_xins nl_yins 3 -1 roll textLM newline
+ } bind def
+/TxCLine { % text TxLine -
+ nl_xins nl_yins 3 -1 roll textCM newline
+ } bind def
+/infline{ % text infline - : plot info-line, but only if switch oooinfo=1
+ oooinfo 1 eq { TxLine } { pop } ifelse
+ } bind def
+/PtTxLine { % pstyle text | -
+ x pstyle
+ nl_xins nl_xshift .5 mul add nl_yins 0 t
+ black nl_xins nl_xshift 1.5 mul add nl_yins 3 2 roll textLM
+ newline
+ } bind def
+/PtPtCvTxLine { % pstyle pstyle cstyle text | -
+ 4 3 roll pstyle nl_xins nl_yins 0 t
+ 3 2 roll pstyle nl_xins nl_xshift add nl_yins 0 t
+ x cstyle
+ nl_xins nl_xshift 2 mul add
+ dup dup nl_xshift nl_xrline mul sub nl_yins 0 ti
+ nl_xshift nl_xrline mul add nl_yins 0 tf
+ nl_xshift add nl_yins 3 2 roll black textLM
+ newline
+ } bind def
+/PtCvTxLine { % pstyle cstyle text | -
+ 3 2 roll pstyle nl_xins nl_yins 0 t
+ x cstyle
+ nl_xins nl_xshift 1 mul add
+ dup dup nl_xshift -.33 mul add nl_yins 0 ti
+ nl_xshift 0.33 mul add nl_yins 0 tf
+ nl_xshift add nl_yins 3 2 roll black textLM
+ newline
+ } bind def
+/PtPtTxLine { % pstyle pstyle text | -
+ 3 2 roll pstyle nl_xins nl_yins 0 t
+ x pstyle nl_xins nl_xshift add nl_yins 0 t
+ black nl_xins nl_xshift 2 mul add nl_yins 3 2 roll textLM
+ newline
+ } bind def
+/CvTxLine { % cstyle text | -
+ x cstyle
+ nl_xins fontsize xmm div nl_xrline mul 0 mul sub nl_yins 0 ti
+ nl_xins fontsize xmm div nl_xrline mul 3 mul add nl_yins 0 tf
+ black nl_xins nl_xshift 1.5 mul add nl_yins 3 2 roll textLM
+ newline
+ } bind def
+/Cv2TxLine { % cstyle text | -
+ x cstyle
+ nl_xins fontsize xmm div nl_xrline mul sub nl_yins 0 ti
+ nl_xins fontsize xmm div nl_xrline mul add nl_xshift add nl_yins 0 tf
+ black nl_xins nl_xshift 2 mul add nl_yins 3 2 roll textLM
+ newline
+ } bind def
+/PCTxLine { % pstyle(with plset) text | -
+ x pstyle
+ nl_xins fontsize xmm div nl_xrline 2 mul mul sub nl_yins 0 ci
+ nl_xins fontsize xmm div nl_xrline 2 mul mul add nl_yins 0 cf
+ nl_xins yins 0 t
+ black nl_xins
+ fontsize xmm div 1.9 mul % instead of xshift
+ add nl_yins 3 2 roll textLM
+ newline
+ } bind def
+/showfilename { % xins yins size | -
+ setown
+ ooofnam 1 eq { filename textRB } { pop pop } ifelse
+ } def
+/InfSet { % ooofnam oooinfo | - : set on(1) or off(0)
+ /oooinfo x def /ooofnam x def
+ } def
+0 0 InfSet % default setting
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Macro Collection %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%% gray areas (mainly applied with grayval=1 for blank areas) [longtime grey..]
+
+/graybox { % grayval x_L y_B dx dy | -
+ boxit
+ cp gsave setgray fill grestore
+ } def
+/boxit { % x_L y_B dx dy | -
+ 4 2 roll
+ np ym x xm x mv % corner Left Bottom
+ ym dup 0 x rl % line up
+ x xm 0 rl % line right
+ neg 0 x rl % line down
+ } def
+/execOval { % xl yl dx dy dr { proc } | - % works only in quadratic grid
+ x 6 2 roll
+ 4 2 roll % proc dr dx dy xl yl
+ gsave
+ xym translate
+ gsave
+ xym scale % BAD: now dr is scale dependent
+ dup neg 0 np mv
+ 0 1 rl
+ dup 0 1 3 2 roll 180 90 arcn
+ 1 0 rl
+ dup 1 1 3 2 roll 90 0 arcn
+ 0 -1 rl
+ dup 1 0 3 2 roll 0 -90 arcn
+ -1 0 rl
+ dup 0 0 3 2 roll -90 -180 arcn
+ pop
+ exec
+ grestore
+ grestore
+ } def
+/execRectangle { % xl xh yl yh (all in user coords) {proc} | -
+ 5 1 roll
+ gsave
+ wy /qqyh x def
+ wy /qqyl x def
+ wx /qqxh x def
+ wx /qqxl x def
+ np
+ qqxl xm qqyl ym mv
+ qqxh xm qqyl ym li
+ qqxh xm qqyh ym li
+ qqxl xm qqyh ym li
+ cp exec grestore
+ } def
+/execHexagon { % xl xh yl yh (all in user coords) {proc} | -
+ 5 1 roll
+ gsave
+ wy /qqyh x def
+ wy /qqyl x def
+ wx /qqxh x def
+ wx /qqxl x def
+ /qqdr qqyh qqyl sub 2 div def
+ np
+ qqxl qqdr add qqyl xym mv
+ qqxh qqdr sub qqyl xym li
+ qqxh qqyl qqdr add xym li
+ qqxh qqdr sub qqyh xym li
+ qqxl qqdr add qqyh xym li
+ qqxl qqyl qqdr add xym li
+ cp exec grestore
+ } def
+/execTrueOval { % xl xh yl yh dr {proc} | -
+ 6 1 roll
+ gsave
+ /qqdr x def
+ /qqyh x def
+ /qqyl x def
+ /qqxh x def
+ /qqxl x def
+ np
+ qqxl qqdr add qqyl xym mv
+ qqxh qqdr sub qqyl xym li
+ qqxh qqdr sub qqyl qqdr add qqdr -90 0 arc
+ qqxh qqyh qqdr sub xym li
+ qqxh qqdr sub qqyh qqdr sub qqdr 0 90 arc
+ qqxl qqdr add qqyh xym li
+ qqxl qqdr add qqyh qqdr sub qqdr 90 180 arc
+ qqxl qqyl qqdr add xym li
+ qqxl qqdr add qqyl qqdr add qqdr 180 270 arc
+ cp exec grestore
+ } def
+/coordRectangle { % xl xh yl yh (all in plot coords) {proc} | -
+ 5 1 roll
+ gsave
+ /qqyh x def
+ /qqyl x def
+ /qqxh x def
+ /qqxl x def
+ np
+ qqxl xm qqyl ym mv
+ qqxh xm qqyl ym li
+ qqxh xm qqyh ym li
+ qqxl xm qqyh ym li
+ cp exec grestore
+ } def
+
+
+%% special objects
+
+/pfeilspitze { % x[local] y[local] rot siz
+ % draw with current linestyle, as set e.g. by linsetAxx
+ x 4 2 roll % siz rot x y
+ gsave
+ xym translate 180 add rotate dup dup dup
+ [] 0 setdash
+ .8 mul x .6 mul np mv 0 0 li .8 mul x -.6 mul li st
+ grestore
+ } def
+/pfeil { % x[local] y[local] rot siz len[global]
+ 5 copy
+ pop pfeilspitze
+ x pop
+ x 4 2 roll % len rot x y
+ gsave
+ xym translate 180 add rotate
+ 0 0 np mv 0 li st
+ grestore
+ } def
+
+/knautschy { % x0 y0 y_knau y_tot knautschy - : insert an S in dived y-axis
+ % the total height of the generated object is y_tot
+ % of which y_knau(.le. y_tot) is for the real knautsch,
+ % the remainder is for vertical prolongations.
+ x ym 4 div dup /tmpy x def 5 sqrt mul /tmpx x def
+ /tmpa x ym tmpy 4 mul sub 2 div def
+ np ym x xm x mv 0 tmpa rl tmpx tmpy rl tmpx -2 mul tmpy 2 mul rl
+ tmpx tmpy rl 0 tmpa rl st
+ } def
+/separy { % x0 y0 sep lng ang lin - : insert an // in dived y-axis
+ setline
+ /spang x def
+ /splng x def
+ /spsep x def
+ 2 copy spsep sub gsave offset spang rotate
+ splng -.5 mul fm 0 np mv splng fm 0 rl st grestore
+ spsep add gsave offset spang rotate
+ splng -.5 mul fm 0 np mv splng fm 0 rl st grestore
+ } def
+
+% broken:
+/setBemasz { % textsize textspace arrowsize arrowthick | -
+ /bmszTH x def
+ /bmszSZ x def
+ /bmszSP x def
+ /bmszOW x def
+ } def
+18 .2 .5 .01 setBemasz
+/Bemasz { % x y dx ang text_ang text | -
+ gsave
+ 6 4 roll offset % consumes x and y
+ 3 2 roll rotate % consumes ang | dx text_ang text
+ bmszOW setown
+ x /bmszRT x def
+ x 2 div x 2 copy % dx/2 text dx/2 text
+ textw 2 div bmszSP add % dx/2 text dx/2 halflabelwidth
+ % ACHTUNG: fuer bmszRT <> 0 ist textw NOCH FALSCH
+ 4 1 roll 0 3 2 roll bmszRT x rtextCM % hlw dx/2
+ dup 2 mul 3 1 roll x sub dup % dx len len
+ 0 0 180 4 -1 roll bmszSZ bmszTH arrow % dx len
+ x 0 0 4 -1 roll bmszSZ bmszTH arrow
+ grestore
+ } def
+
+
+%% Text composition shortcuts:
+
+/g { x grec endgr} bind def
+/sb { x subsc endsc} bind def
+/sp { x supsc endsc} bind def
+/sbgr { x grec () subsc endsc () endgr} bind def
+/spgr { x grec () supsc endsc () endgr} bind def
+
+
+%% Text macros for neutron scattering:
+
+/hbar {
+ showif
+ (h) 1.2 .66 {
+ currentpoint fontheight .11 mul setline np mv
+ fontheight dup .8 mul x .3 mul rl
+ st ()
+ } build
+ } bind def
+/hbarw { hbar () grec (w) endgr } bind def
+/wbar { grec (w) endgr ( / 2) grec (p) endgr } bind def
+/Sqw { showif (S\(q,) grec (w) endgr (\)) showif } bind def
+/Sqn { showif (S\(q,) grec (n) endgr (\)) showif } bind def
+/SQw { showif (S\(Q,) grec (w) endgr (\)) showif } bind def
+/Sttw { showif (S\(2) grec (q) endgr (,) grec (w) endgr (\)) showif } bind def
+/Sttn { showif (S\(2) grec (q) endgr (,) grec (n) endgr (\)) showif } bind def
+/Xqw { grec (c) endgr (''\(q,) grec (w) endgr (\)) showif } bind def
+/Xqn { grec (c) endgr (''\(q,) grec (n) endgr (\)) showif } bind def
+/ueV{ grec (m) endgr (eV) showif} bind def
+/inueV { showif (\() grec (m) endgr (eV\)) showif } bind def
+/inmeVr { showif (\(meV) supsc (-1) endsc (\)) showif } bind def
+/inueVr { showif (\() grec (m) endgr (eV)
+ supsc (-1) endsc (\)) showif } bind def
+/inGHzr { showif (\(GHz) (-1) sp (\)) showif } def
+
+%% home-made Angstr is obsolete; use \375 or Ã…
+/Angstr {
+ showif
+ (A) .5 1.23 {
+ currentpoint fontheight .1 mul setline np
+ fontheight .14 mul 0 360 arc st ()
+ } build
+} bind def
+/Angr { Angstr () supsc (-1) endsc } bind def
+/inAngr { showif (\() Angr (\)) showif } bind def
+/Angrr { Angstr () supsc (-2) endsc } bind def
+/inAngrr { showif (\() Angr (\)) showif } bind def
+/wmin {grec (w) endgr () subsc (min) endsc} def
+/winpi { grec (w) endgr ( / 2) grec (p) endgr } def
+/Celsius { showif (\26x)g(C) showif } bind def
+
+
+%% More shortcuts for impatient users:
+
+/L { langSel } bind def
+/G { gsave exec grestore } bind def
+/gs { gsave } bind def
+/gr { grestore } bind def
+
+end % WuGdict...
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Mark "ewu", the end of the wups.. macro definition file %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+WuGdict11a begin
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Customizable plot setup, copied from g3.ps (editör: use latin-1) %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Position and scale:
+
+originUpperLeft_A4
+10 dup autolabel defsiz
+1 dup geld stdred
+2. -11 offset
+
+%% Various presets:
+
+1 1 language
+0 0 InfSet % plot fnam, info
+1 dup 2 SymGSet % srad slin serr(2=from pset) : graph symbols, global preset
+% /setboxbackgroundcolor { 0.93 setgray } def % default is white
+2 8 24 abcset % usage: {(text)} abc
+/EndFrame { showpage end } def
+
+%% Symbols and curve styles:
+
+F /pcol x def % black&white on/off
+{ 8 aCol5 iColA } /ipCol x bind def % number of colours and colour style
+/pStyles [
+{ pcol { 1 1 0 1. 1. pset } { 11 0 0 1. 1. pset 0 ipCol } ifelse }
+{ pcol { 1 0 0 1. 1. pset } { 12 1 0 1. 1. pset 1 ipCol } ifelse }
+{ pcol { 2 1 0 1. 1. pset } { 13 1 0 1. 1. pset 2 ipCol } ifelse }
+{ pcol { 2 0 0 1. 1. pset } { 1 0 0 1. 1. pset 3 ipCol } ifelse }
+{ pcol { 3 1 0 1. 1. pset } { 1 1 0 .7 1. pset 4 ipCol } ifelse }
+
+{ pcol { 3 0 0 1. 1. pset } { 3 0 0 1. 1. pset 5 ipCol } ifelse }
+{ pcol { 4 1 0 1. 1. pset } { 3 1 0 .7 1. pset 6 ipCol } ifelse }
+{ pcol { 4 0 0 1. 1. pset } { 4 0 0 1. 1. pset 7 ipCol } ifelse }
+{ pcol { 5 1 0 1. 1. pset } { 4 1 0 .7 1. pset 0 ipCol } ifelse }
+{ pcol { 5 0 0 1. 1. pset } { 5 0 0 1. 1. pset 1 ipCol } ifelse }
+
+{ pcol { 5 0 0 1. 1. pset } { 5 1 0 .7 1. pset 2 ipCol } ifelse }
+{ pcol { 3 0 0 1. 1. pset } { 2 0 0 1. 1. pset 3 ipCol } ifelse }
+{ pcol { 4 1 0 1. 1. pset } { 2 1 0 .7 1. pset 4 ipCol } ifelse }
+] def
+
+T /ccol x def % black&white on/off
+{ 8 aCol2 iColA } /icCol x bind def % number of colours and colour style
+/cStyles [
+{ ccol { 1. [ ] lset } { 1. [] lset 0 icCol } ifelse }
+{ ccol { 1. [1 3 ] lset } { 1. [] lset 1 icCol } ifelse }
+{ ccol { 1. [8 6 ] lset } { 1. [] lset 2 icCol } ifelse }
+{ ccol { 1. [8 3 1 3 ] lset } { 1. [] lset 3 icCol } ifelse }
+] def
+
+%% Clear frame:
+
+Resets
+BoxBackground
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Mark "ecu", end of the customization section %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+24 setown
+-.16 1.6 {(Gnuplot Default Symbols as Used in Frida)} textLM
+21 setown
+/next{ .9 0 offset } def
+
+
+ 1 pstyle 0 0 0 ti black .24 0 {(0) } textLM next
+ 2 pstyle 0 0 0 ti black .24 0 {(1) } textLM next
+ 3 pstyle 0 0 0 ti black .24 0 {(2) } textLM next
+ 4 pstyle 0 0 0 ti black .24 0 {(3) } textLM next
+ 5 pstyle 0 0 0 ti black .24 0 {(4) } textLM next
+ 6 pstyle 0 0 0 ti black .24 0 {(5) } textLM next
+ 7 pstyle 0 0 0 ti black .24 0 {(6) } textLM next
+ 8 pstyle 0 0 0 ti black .24 0 {(7) } textLM next
+ 9 pstyle 0 0 0 ti black .24 0 {(8) } textLM next
+10 pstyle 0 0 0 ti black .24 0 {(9) } textLM next /next{ 1.1 0 offset } def
+11 pstyle 0 0 0 ti black .24 0 {(10)} textLM next
+12 pstyle 0 0 0 ti black .24 0 {(11)} textLM next
+13 pstyle 0 0 0 ti black .24 0 {(12)} textLM next
+
+ EndFrame
diff --git a/pub/share/wups11a.ps b/pub/share/wups11a.ps
index 4fba7a27..dae88bf2 100644
--- a/pub/share/wups11a.ps
+++ b/pub/share/wups11a.ps
@@ -326,6 +326,16 @@ WuGdict11a begin
{ 120 80 30 }
{ 100 60 20 }
] def
+/aCol5 [ % gnuplot default (see man gnuplot and rgb.txt)
+ { 255 0 0 } % red
+ { 0 255 0 } % green
+ { 0 0 255 } % blue
+ { 255 0 255 } % magenta
+ { 0 255 255 } % cyan
+ { 160 82 45 } % sienna
+ { 255 165 0 } % orange
+ { 255 127 80 } % coral
+ ] def
%% Specialized ifelse, depending on pcol / ccol - OBSOLETE since 11a:
diff --git a/pub/src/commands.cpp b/pub/src/commands.cpp
index 68bcd216..af9f4372 100644
--- a/pub/src/commands.cpp
+++ b/pub/src/commands.cpp
@@ -279,6 +279,8 @@ bool fridaCommand( string cmd )
" gnd set maximum number of data points\n"
" gnc number of equidistant base points for curve plotting\n"
" gcr allow iterative refinement for curve plotting?\n"
+ "Help:\n"
+ " gsym explain plot symbols\n"
;
} else if ( cmd == "gx" ) {
@@ -341,6 +343,8 @@ bool fridaCommand( string cmd )
break;
NPloWin::Plots[NPloWin::iPlot]->gp_write(cmd);
}
+ } else if (cmd == "gsym") {
+ system( ("gv " + NRead::wofmac( "\\psgsym" ) + "&").c_str() );
} else if (cmd == "p") {
NPlot::Plot( NPloWin::Plots[NPloWin::iPlot], 0);
} else if (cmd == "pp") {
--
GitLab