diff options
-rw-r--r-- | ChangeLog | 35 | ||||
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | aclocal.m4 | 4 | ||||
-rwxr-xr-x | configure | 504 | ||||
-rwxr-xr-x | doc/homepage.ms | 97 | ||||
-rw-r--r-- | src/devices/grodvi/dvi.cc | 85 | ||||
-rw-r--r-- | src/devices/grodvi/grodvi.man | 11 | ||||
-rw-r--r-- | src/devices/grops/ps.cc | 3 | ||||
-rw-r--r-- | tmac/an-old.tmac | 16 | ||||
-rw-r--r-- | tmac/dvi.tmac | 549 | ||||
-rw-r--r-- | tmac/www.tmac | 16 |
11 files changed, 1005 insertions, 322 deletions
@@ -1,3 +1,38 @@ +2002-02-28 Werner LEMBERG <wl@gnu.org> + + Add color support to grodvi (for drawing colors are currently + translated to gray values). + + * src/devices/grodvi/dvi.cc (FILL_MAX): Removed. + (dvi_printer): Add `cur_color' member. + (dvi_printer::set_color): New function. + (draw_dvi_printer): Remove `fill'. + (draw_dvi_printer::fill_next): Pass environment as parameter. + Update code for new color support translated to gray. + (dvi_printer::set_char): Updated. + (dvi_printer::begin_page, dvi_printer::end_page): Handle color + changes crossing the page border. + (dvi_printer::draw): Updated. + Remove cases `f' and `F'. + * tmac/dvi.tmac: Add color definitions. + * NEWS, src/devices/grodvi/grodvi.man: Updated. + + * tmac/an-old.tmac (R): Make this a macro to emit a warning if + used incorrectly. + + * aclocal.m4 (GROFF_NEED_DECLARATION): Use test similar to recent + versions of autoconf. + * configure: Updated. + + * doc/homepage.ms: Use `.blm'. + * tmac/www.tmac (www-depth): New auxiliary variable. + (www-pop-level): Don't issue HTML tag. + (ULS, ULE, LI): Use absolute indentation. + + * src/devices/grops/ps.cc (ps_printer::begin_page, + ps_printer::end_page): Switch forth and back to default color while + starting a new page. + 2002-02-27 Werner LEMBERG <wl@gnu.org> Add EC and TC fonts to devdvi. @@ -14,10 +14,10 @@ Troff ----- o Color support has been added to troff and pic (and to the device drivers - grops, grotty, and grohtml -- other preprocessors and drivers will + grops, grodvi, grotty, and grohtml -- other preprocessors and drivers will follow). A new function `defcolor' defines colors; the escape sequence `\m' sets the drawing color, the escape sequence `\M' specifies the - background color for closed objects created with \D'...' commands. + background color for closed objects created with \D'...' commands. Similar to fonts, `\mP' and `\MP' switch back to the previous color. `\m' and `\M' correspond to the new troff output command sets starting with `m' and `DF'. The device-specific default color is called `default' and can't @@ -215,6 +215,9 @@ o EC and TC fonts have been integrated. Use `-mec' (calling the file Note that ec.tmac must be called before any language-specific files; it doesn't take care of hcode values. +o Color support has been added. For drawing commands, colors are translated + to gray values currently. + Grotty ------ @@ -492,7 +492,9 @@ AC_CACHE_VAL(groff_cv_decl_needed_$1, #ifdef HAVE_MATH_H #include <math.h> #endif], -[char *(*pfn) = (char *(*)) $1], +[#ifndef $1 + char *p = (char *) $1; +#endif], groff_cv_decl_needed_$1=no, groff_cv_decl_needed_$1=yes)]) AC_MSG_RESULT($groff_cv_decl_needed_$1) @@ -2981,22 +2981,24 @@ else int main () { -char *(*pfn) = (char *(*)) gettimeofday +#ifndef gettimeofday + char *p = (char *) gettimeofday; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2990: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2993: \$? = $ac_status" >&5 + echo "$as_me:2995: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2996: \"$ac_try\"") >&5 + { (eval echo "$as_me:2998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2999: \$? = $ac_status" >&5 + echo "$as_me:3001: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_gettimeofday=no else @@ -3007,7 +3009,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3010: result: $groff_cv_decl_needed_gettimeofday" >&5 +echo "$as_me:3012: result: $groff_cv_decl_needed_gettimeofday" >&5 echo "${ECHO_T}$groff_cv_decl_needed_gettimeofday" >&6 if test $groff_cv_decl_needed_gettimeofday = yes; then @@ -3022,7 +3024,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3025: checking whether hypot must be declared" >&5 +echo "$as_me:3027: checking whether hypot must be declared" >&5 echo $ECHO_N "checking whether hypot must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3034,7 +3036,7 @@ if test "${groff_cv_decl_needed_hypot+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3037 "configure" +#line 3039 "configure" #include "confdefs.h" #include <stdio.h> @@ -3059,22 +3061,24 @@ else int main () { -char *(*pfn) = (char *(*)) hypot +#ifndef hypot + char *p = (char *) hypot; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3068: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3072: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3071: \$? = $ac_status" >&5 + echo "$as_me:3075: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3074: \"$ac_try\"") >&5 + { (eval echo "$as_me:3078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3077: \$? = $ac_status" >&5 + echo "$as_me:3081: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_hypot=no else @@ -3085,7 +3089,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3088: result: $groff_cv_decl_needed_hypot" >&5 +echo "$as_me:3092: result: $groff_cv_decl_needed_hypot" >&5 echo "${ECHO_T}$groff_cv_decl_needed_hypot" >&6 if test $groff_cv_decl_needed_hypot = yes; then @@ -3100,7 +3104,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3103: checking whether popen must be declared" >&5 +echo "$as_me:3107: checking whether popen must be declared" >&5 echo $ECHO_N "checking whether popen must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3112,7 +3116,7 @@ if test "${groff_cv_decl_needed_popen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3115 "configure" +#line 3119 "configure" #include "confdefs.h" #include <stdio.h> @@ -3137,22 +3141,24 @@ else int main () { -char *(*pfn) = (char *(*)) popen +#ifndef popen + char *p = (char *) popen; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3146: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3152: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3149: \$? = $ac_status" >&5 + echo "$as_me:3155: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3152: \"$ac_try\"") >&5 + { (eval echo "$as_me:3158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3155: \$? = $ac_status" >&5 + echo "$as_me:3161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_popen=no else @@ -3163,7 +3169,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3166: result: $groff_cv_decl_needed_popen" >&5 +echo "$as_me:3172: result: $groff_cv_decl_needed_popen" >&5 echo "${ECHO_T}$groff_cv_decl_needed_popen" >&6 if test $groff_cv_decl_needed_popen = yes; then @@ -3178,7 +3184,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3181: checking whether pclose must be declared" >&5 +echo "$as_me:3187: checking whether pclose must be declared" >&5 echo $ECHO_N "checking whether pclose must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3190,7 +3196,7 @@ if test "${groff_cv_decl_needed_pclose+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3193 "configure" +#line 3199 "configure" #include "confdefs.h" #include <stdio.h> @@ -3215,22 +3221,24 @@ else int main () { -char *(*pfn) = (char *(*)) pclose +#ifndef pclose + char *p = (char *) pclose; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3232: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3227: \$? = $ac_status" >&5 + echo "$as_me:3235: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3230: \"$ac_try\"") >&5 + { (eval echo "$as_me:3238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3233: \$? = $ac_status" >&5 + echo "$as_me:3241: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_pclose=no else @@ -3241,7 +3249,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3244: result: $groff_cv_decl_needed_pclose" >&5 +echo "$as_me:3252: result: $groff_cv_decl_needed_pclose" >&5 echo "${ECHO_T}$groff_cv_decl_needed_pclose" >&6 if test $groff_cv_decl_needed_pclose = yes; then @@ -3256,7 +3264,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3259: checking whether putenv must be declared" >&5 +echo "$as_me:3267: checking whether putenv must be declared" >&5 echo $ECHO_N "checking whether putenv must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3268,7 +3276,7 @@ if test "${groff_cv_decl_needed_putenv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3271 "configure" +#line 3279 "configure" #include "confdefs.h" #include <stdio.h> @@ -3293,22 +3301,24 @@ else int main () { -char *(*pfn) = (char *(*)) putenv +#ifndef putenv + char *p = (char *) putenv; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3302: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3312: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3305: \$? = $ac_status" >&5 + echo "$as_me:3315: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3308: \"$ac_try\"") >&5 + { (eval echo "$as_me:3318: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3311: \$? = $ac_status" >&5 + echo "$as_me:3321: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_putenv=no else @@ -3319,7 +3329,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3322: result: $groff_cv_decl_needed_putenv" >&5 +echo "$as_me:3332: result: $groff_cv_decl_needed_putenv" >&5 echo "${ECHO_T}$groff_cv_decl_needed_putenv" >&6 if test $groff_cv_decl_needed_putenv = yes; then @@ -3334,7 +3344,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3337: checking whether strcasecmp must be declared" >&5 +echo "$as_me:3347: checking whether strcasecmp must be declared" >&5 echo $ECHO_N "checking whether strcasecmp must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3346,7 +3356,7 @@ if test "${groff_cv_decl_needed_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3349 "configure" +#line 3359 "configure" #include "confdefs.h" #include <stdio.h> @@ -3371,22 +3381,24 @@ else int main () { -char *(*pfn) = (char *(*)) strcasecmp +#ifndef strcasecmp + char *p = (char *) strcasecmp; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3380: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3383: \$? = $ac_status" >&5 + echo "$as_me:3395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3386: \"$ac_try\"") >&5 + { (eval echo "$as_me:3398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3389: \$? = $ac_status" >&5 + echo "$as_me:3401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_strcasecmp=no else @@ -3397,7 +3409,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3400: result: $groff_cv_decl_needed_strcasecmp" >&5 +echo "$as_me:3412: result: $groff_cv_decl_needed_strcasecmp" >&5 echo "${ECHO_T}$groff_cv_decl_needed_strcasecmp" >&6 if test $groff_cv_decl_needed_strcasecmp = yes; then @@ -3412,7 +3424,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3415: checking whether strncasecmp must be declared" >&5 +echo "$as_me:3427: checking whether strncasecmp must be declared" >&5 echo $ECHO_N "checking whether strncasecmp must be declared... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -3424,7 +3436,7 @@ if test "${groff_cv_decl_needed_strncasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3427 "configure" +#line 3439 "configure" #include "confdefs.h" #include <stdio.h> @@ -3449,22 +3461,24 @@ else int main () { -char *(*pfn) = (char *(*)) strncasecmp +#ifndef strncasecmp + char *p = (char *) strncasecmp; +#endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3458: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3461: \$? = $ac_status" >&5 + echo "$as_me:3475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3464: \"$ac_try\"") >&5 + { (eval echo "$as_me:3478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3467: \$? = $ac_status" >&5 + echo "$as_me:3481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_decl_needed_strncasecmp=no else @@ -3475,7 +3489,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3478: result: $groff_cv_decl_needed_strncasecmp" >&5 +echo "$as_me:3492: result: $groff_cv_decl_needed_strncasecmp" >&5 echo "${ECHO_T}$groff_cv_decl_needed_strncasecmp" >&6 if test $groff_cv_decl_needed_strncasecmp = yes; then @@ -3496,10 +3510,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3499: checking for sys_nerr in <errno.h> or <stdio.h>" >&5 +echo "$as_me:3513: checking for sys_nerr in <errno.h> or <stdio.h>" >&5 echo $ECHO_N "checking for sys_nerr in <errno.h> or <stdio.h>... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3502 "configure" +#line 3516 "configure" #include "confdefs.h" #include <errno.h> #include <stdio.h> @@ -3512,18 +3526,18 @@ int k; k = sys_nerr; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3515: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3518: \$? = $ac_status" >&5 + echo "$as_me:3532: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3521: \"$ac_try\"") >&5 + { (eval echo "$as_me:3535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3524: \$? = $ac_status" >&5 + echo "$as_me:3538: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3526: result: yes" >&5 + echo "$as_me:3540: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_SYS_NERR 1 @@ -3532,7 +3546,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3535: result: no" >&5 +echo "$as_me:3549: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3542,10 +3556,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3545: checking for sys_errlist in <errno.h> or <stdio.h>" >&5 +echo "$as_me:3559: checking for sys_errlist in <errno.h> or <stdio.h>" >&5 echo $ECHO_N "checking for sys_errlist in <errno.h> or <stdio.h>... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3548 "configure" +#line 3562 "configure" #include "confdefs.h" #include <errno.h> #include <stdio.h> @@ -3558,18 +3572,18 @@ int k; k = (int)sys_errlist[0]; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3561: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3575: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3564: \$? = $ac_status" >&5 + echo "$as_me:3578: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3567: \"$ac_try\"") >&5 + { (eval echo "$as_me:3581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3570: \$? = $ac_status" >&5 + echo "$as_me:3584: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3572: result: yes" >&5 + echo "$as_me:3586: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_SYS_ERRLIST 1 @@ -3578,7 +3592,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3581: result: no" >&5 +echo "$as_me:3595: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3588,10 +3602,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3591: checking C++ <osfcn.h>" >&5 +echo "$as_me:3605: checking C++ <osfcn.h>" >&5 echo $ECHO_N "checking C++ <osfcn.h>... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3594 "configure" +#line 3608 "configure" #include "confdefs.h" #include <osfcn.h> int @@ -3603,18 +3617,18 @@ read(0, 0, 0); open(0, 0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3606: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3620: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3609: \$? = $ac_status" >&5 + echo "$as_me:3623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3612: \"$ac_try\"") >&5 + { (eval echo "$as_me:3626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3615: \$? = $ac_status" >&5 + echo "$as_me:3629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3617: result: yes" >&5 + echo "$as_me:3631: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_CC_OSFCN_H 1 @@ -3623,7 +3637,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3626: result: no" >&5 +echo "$as_me:3640: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3639,10 +3653,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3642: checking C++ <limits.h>" >&5 +echo "$as_me:3656: checking C++ <limits.h>" >&5 echo $ECHO_N "checking C++ <limits.h>... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3645 "configure" +#line 3659 "configure" #include "confdefs.h" #include <limits.h> int @@ -3654,18 +3668,18 @@ int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3657: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3660: \$? = $ac_status" >&5 + echo "$as_me:3674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3663: \"$ac_try\"") >&5 + { (eval echo "$as_me:3677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3666: \$? = $ac_status" >&5 + echo "$as_me:3680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3668: result: yes" >&5 + echo "$as_me:3682: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_CC_LIMITS_H 1 @@ -3674,7 +3688,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3677: result: no" >&5 +echo "$as_me:3691: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3690,10 +3704,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3693: checking for inttypes.h" >&5 +echo "$as_me:3707: checking for inttypes.h" >&5 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3696 "configure" +#line 3710 "configure" #include "confdefs.h" #include <sys/types.h> #include <inttypes.h> @@ -3706,16 +3720,16 @@ uintmax_t i = (uintmax_t)-1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3709: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3723: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3712: \$? = $ac_status" >&5 + echo "$as_me:3726: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3715: \"$ac_try\"") >&5 + { (eval echo "$as_me:3729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3718: \$? = $ac_status" >&5 + echo "$as_me:3732: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_header_inttypes_h=yes else @@ -3724,7 +3738,7 @@ cat conftest.$ac_ext >&5 groff_cv_header_inttypes_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3727: result: $groff_cv_header_inttypes_h" >&5 +echo "$as_me:3741: result: $groff_cv_header_inttypes_h" >&5 echo "${ECHO_T}$groff_cv_header_inttypes_h" >&6 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3738,10 +3752,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3741: checking for unsigned long long" >&5 +echo "$as_me:3755: checking for unsigned long long" >&5 echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3744 "configure" +#line 3758 "configure" #include "confdefs.h" unsigned long long ull = 1; int i = 63; int @@ -3754,16 +3768,16 @@ return ull << i | ull >> i | ullmax / ull | ullmax % ull; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3757: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3771: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3760: \$? = $ac_status" >&5 + echo "$as_me:3774: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3763: \"$ac_try\"") >&5 + { (eval echo "$as_me:3777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3766: \$? = $ac_status" >&5 + echo "$as_me:3780: \$? = $ac_status" >&5 (exit $ac_status); }; }; then groff_cv_type_unsigned_long_long=yes else @@ -3772,7 +3786,7 @@ cat conftest.$ac_ext >&5 groff_cv_type_unsigned_long_long=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:3775: result: $groff_cv_type_unsigned_long_long" >&5 +echo "$as_me:3789: result: $groff_cv_type_unsigned_long_long" >&5 echo "${ECHO_T}$groff_cv_type_unsigned_long_long" >&6 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3797,10 +3811,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:3800: checking for declaration of time_t" >&5 +echo "$as_me:3814: checking for declaration of time_t" >&5 echo $ECHO_N "checking for declaration of time_t... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3803 "configure" +#line 3817 "configure" #include "confdefs.h" #include <time.h> int @@ -3812,23 +3826,23 @@ time_t t = time(0); struct tm *p = localtime(&t); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3815: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3829: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3818: \$? = $ac_status" >&5 + echo "$as_me:3832: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3821: \"$ac_try\"") >&5 + { (eval echo "$as_me:3835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3824: \$? = $ac_status" >&5 + echo "$as_me:3838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3826: result: yes" >&5 + echo "$as_me:3840: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3831: result: no" >&5 +echo "$as_me:3845: result: no" >&5 echo "${ECHO_T}no" >&6; cat >>confdefs.h <<\EOF #define LONG_FOR_TIME_T 1 @@ -3842,13 +3856,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:3845: checking return type of signal handlers" >&5 +echo "$as_me:3859: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3851 "configure" +#line 3865 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3870,16 +3884,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3873: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3887: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3876: \$? = $ac_status" >&5 + echo "$as_me:3890: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3879: \"$ac_try\"") >&5 + { (eval echo "$as_me:3893: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3882: \$? = $ac_status" >&5 + echo "$as_me:3896: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -3889,17 +3903,17 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3892: result: $ac_cv_type_signal" >&5 +echo "$as_me:3906: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF #define RETSIGTYPE $ac_cv_type_signal EOF -echo "$as_me:3899: checking struct exception" >&5 +echo "$as_me:3913: checking struct exception" >&5 echo $ECHO_N "checking struct exception... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3902 "configure" +#line 3916 "configure" #include "confdefs.h" #include <math.h> int @@ -3911,18 +3925,18 @@ struct exception e; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3917: \$? = $ac_status" >&5 + echo "$as_me:3931: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3920: \"$ac_try\"") >&5 + { (eval echo "$as_me:3934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3923: \$? = $ac_status" >&5 + echo "$as_me:3937: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3925: result: yes" >&5 + echo "$as_me:3939: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_STRUCT_EXCEPTION 1 @@ -3931,11 +3945,11 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3934: result: no" >&5 +echo "$as_me:3948: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:3938: checking for sin in -lm" >&5 +echo "$as_me:3952: checking for sin in -lm" >&5 echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6 if test "${ac_cv_lib_m_sin+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3943,7 +3957,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3946 "configure" +#line 3960 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3962,16 +3976,16 @@ sin (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3968: \$? = $ac_status" >&5 + echo "$as_me:3982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3971: \"$ac_try\"") >&5 + { (eval echo "$as_me:3985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3974: \$? = $ac_status" >&5 + echo "$as_me:3988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_m_sin=yes else @@ -3982,19 +3996,19 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3985: result: $ac_cv_lib_m_sin" >&5 +echo "$as_me:3999: result: $ac_cv_lib_m_sin" >&5 echo "${ECHO_T}$ac_cv_lib_m_sin" >&6 if test $ac_cv_lib_m_sin = yes; then LIBM=-lm fi -echo "$as_me:3991: checking for ANSI C header files" >&5 +echo "$as_me:4005: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3997 "configure" +#line 4011 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4002,13 +4016,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:4005: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4019: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4011: \$? = $ac_status" >&5 + echo "$as_me:4025: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4030,7 +4044,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 4033 "configure" +#line 4047 "configure" #include "confdefs.h" #include <string.h> @@ -4048,7 +4062,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 4051 "configure" +#line 4065 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4069,7 +4083,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 4072 "configure" +#line 4086 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -4095,15 +4109,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4098: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4112: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4101: \$? = $ac_status" >&5 + echo "$as_me:4115: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4103: \"$ac_try\"") >&5 + { (eval echo "$as_me:4117: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4106: \$? = $ac_status" >&5 + echo "$as_me:4120: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4116,7 +4130,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:4119: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4133: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4132,28 +4146,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4135: checking for $ac_header" >&5 +echo "$as_me:4149: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4141 "configure" +#line 4155 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4147: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4161: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4150: \$? = $ac_status" >&5 + echo "$as_me:4164: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4153: \"$ac_try\"") >&5 + { (eval echo "$as_me:4167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4156: \$? = $ac_status" >&5 + echo "$as_me:4170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4163,7 +4177,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4166: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4180: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -4176,23 +4190,23 @@ done for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4179: checking for $ac_header" >&5 +echo "$as_me:4193: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4185 "configure" +#line 4199 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4189: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4203: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4195: \$? = $ac_status" >&5 + echo "$as_me:4209: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4211,7 +4225,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4214: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4228: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -4224,13 +4238,13 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4227: checking for $ac_func" >&5 +echo "$as_me:4241: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4233 "configure" +#line 4247 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4261,16 +4275,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4264: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4278: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4267: \$? = $ac_status" >&5 + echo "$as_me:4281: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4270: \"$ac_try\"") >&5 + { (eval echo "$as_me:4284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4273: \$? = $ac_status" >&5 + echo "$as_me:4287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4280,7 +4294,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4283: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4297: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4290,7 +4304,7 @@ EOF fi done -echo "$as_me:4293: checking for working mmap" >&5 +echo "$as_me:4307: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4299,7 +4313,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 4302 "configure" +#line 4316 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. @@ -4426,15 +4440,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4429: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4443: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4432: \$? = $ac_status" >&5 + echo "$as_me:4446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4434: \"$ac_try\"") >&5 + { (eval echo "$as_me:4448: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4437: \$? = $ac_status" >&5 + echo "$as_me:4451: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else @@ -4446,7 +4460,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:4449: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:4463: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -4463,13 +4477,13 @@ LIBS="$LIBS -lc $LIBM" for ac_func in fmod getcwd putenv snprintf strerror strtol do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4466: checking for $ac_func" >&5 +echo "$as_me:4480: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4472 "configure" +#line 4486 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4500,16 +4514,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4503: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4517: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4506: \$? = $ac_status" >&5 + echo "$as_me:4520: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4509: \"$ac_try\"") >&5 + { (eval echo "$as_me:4523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4512: \$? = $ac_status" >&5 + echo "$as_me:4526: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4519,7 +4533,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4522: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4536: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4536,13 +4550,13 @@ LIBS="$saved_libs" for ac_func in gettimeofday rename strcasecmp strncasecmp strsep do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4539: checking for $ac_func" >&5 +echo "$as_me:4553: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4545 "configure" +#line 4559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4573,16 +4587,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4590: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4579: \$? = $ac_status" >&5 + echo "$as_me:4593: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4582: \"$ac_try\"") >&5 + { (eval echo "$as_me:4596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4585: \$? = $ac_status" >&5 + echo "$as_me:4599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4592,7 +4606,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4595: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4609: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4602,7 +4616,7 @@ EOF fi done -echo "$as_me:4605: checking for mkstemp" >&5 +echo "$as_me:4619: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' @@ -4611,7 +4625,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 4614 "configure" +#line 4628 "configure" #include "confdefs.h" #include <stdlib.h> int (*f) (char *); @@ -4624,18 +4638,18 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4641: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4630: \$? = $ac_status" >&5 + echo "$as_me:4644: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4633: \"$ac_try\"") >&5 + { (eval echo "$as_me:4647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4636: \$? = $ac_status" >&5 + echo "$as_me:4650: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4638: result: yes" >&5 + echo "$as_me:4652: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define HAVE_MKSTEMP 1 @@ -4644,7 +4658,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:4647: result: no" >&5 +echo "$as_me:4661: result: no" >&5 echo "${ECHO_T}no" >&6;LIBOBJS="$LIBOBJS mkstemp.$ac_objext" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -4654,13 +4668,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:4657: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "$as_me:4671: checking for sys_siglist declaration in signal.h or unistd.h" >&5 echo $ECHO_N "checking for sys_siglist declaration in signal.h or unistd.h... $ECHO_C" >&6 if test "${ac_cv_decl_sys_siglist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4663 "configure" +#line 4677 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -4678,16 +4692,16 @@ char *msg = *(sys_siglist + 1); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4681: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4695: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4684: \$? = $ac_status" >&5 + echo "$as_me:4698: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4687: \"$ac_try\"") >&5 + { (eval echo "$as_me:4701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4690: \$? = $ac_status" >&5 + echo "$as_me:4704: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_decl_sys_siglist=yes else @@ -4697,7 +4711,7 @@ ac_cv_decl_sys_siglist=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4700: result: $ac_cv_decl_sys_siglist" >&5 +echo "$as_me:4714: result: $ac_cv_decl_sys_siglist" >&5 echo "${ECHO_T}$ac_cv_decl_sys_siglist" >&6 if test $ac_cv_decl_sys_siglist = yes; then @@ -4713,10 +4727,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:4716: checking whether ANSI array delete syntax supported" >&5 +echo "$as_me:4730: checking whether ANSI array delete syntax supported" >&5 echo $ECHO_N "checking whether ANSI array delete syntax supported... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4719 "configure" +#line 4733 "configure" #include "confdefs.h" int @@ -4728,23 +4742,23 @@ char *p = new char[5]; delete [] p; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4731: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4745: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4734: \$? = $ac_status" >&5 + echo "$as_me:4748: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4737: \"$ac_try\"") >&5 + { (eval echo "$as_me:4751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4740: \$? = $ac_status" >&5 + echo "$as_me:4754: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4742: result: yes" >&5 + echo "$as_me:4756: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:4747: result: no" >&5 +echo "$as_me:4761: result: no" >&5 echo "${ECHO_T}no" >&6; cat >>confdefs.h <<\EOF #define ARRAY_DELETE_NEEDS_SIZE 1 @@ -4764,10 +4778,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:4767: checking traditional preprocessor" >&5 +echo "$as_me:4781: checking traditional preprocessor" >&5 echo $ECHO_N "checking traditional preprocessor... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4770 "configure" +#line 4784 "configure" #include "confdefs.h" #define name2(a,b) a/**/b int @@ -4779,18 +4793,18 @@ int name2(foo,bar); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4782: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4796: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4785: \$? = $ac_status" >&5 + echo "$as_me:4799: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4788: \"$ac_try\"") >&5 + { (eval echo "$as_me:4802: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4791: \$? = $ac_status" >&5 + echo "$as_me:4805: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4793: result: yes" >&5 + echo "$as_me:4807: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define TRADITIONAL_CPP 1 @@ -4799,7 +4813,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:4802: result: no" >&5 +echo "$as_me:4816: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4809,14 +4823,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:4812: checking w_coredump" >&5 +echo "$as_me:4826: checking w_coredump" >&5 echo $ECHO_N "checking w_coredump... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - echo "$as_me:4815: result: no" >&5 + echo "$as_me:4829: result: no" >&5 echo "${ECHO_T}no" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4819 "configure" +#line 4833 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -4832,17 +4846,17 @@ main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4835: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4838: \$? = $ac_status" >&5 + echo "$as_me:4852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4840: \"$ac_try\"") >&5 + { (eval echo "$as_me:4854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4843: \$? = $ac_status" >&5 + echo "$as_me:4857: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:4845: result: yes" >&5 + echo "$as_me:4859: result: yes" >&5 echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\EOF #define WCOREFLAG 0200 @@ -4852,18 +4866,18 @@ else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:4855: result: no" >&5 +echo "$as_me:4869: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4860: checking default value for grops -b option" >&5 +echo "$as_me:4874: checking default value for grops -b option" >&5 echo $ECHO_N "checking default value for grops -b option... $ECHO_C" >&6 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7 -echo "$as_me:4863: result: $BROKEN_SPOOLER_FLAGS" >&5 +echo "$as_me:4877: result: $BROKEN_SPOOLER_FLAGS" >&5 echo "${ECHO_T}$BROKEN_SPOOLER_FLAGS" >&6 -echo "$as_me:4866: checking default paper size" >&5 +echo "$as_me:4880: checking default paper size" >&5 echo $ECHO_N "checking default paper size... $ECHO_C" >&6 if test -z "$PAGE"; then descfile= @@ -4909,22 +4923,22 @@ cat >>confdefs.h <<\EOF EOF fi -echo "$as_me:4912: result: $PAGE" >&5 +echo "$as_me:4926: result: $PAGE" >&5 echo "${ECHO_T}$PAGE" >&6 -echo "$as_me:4915: checking for existing troff installation" >&5 +echo "$as_me:4929: checking for existing troff installation" >&5 echo $ECHO_N "checking for existing troff installation... $ECHO_C" >&6 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then - echo "$as_me:4918: result: yes" >&5 + echo "$as_me:4932: result: yes" >&5 echo "${ECHO_T}yes" >&6 g=g else - echo "$as_me:4922: result: no" >&5 + echo "$as_me:4936: result: no" >&5 echo "${ECHO_T}no" >&6 g= fi -echo "$as_me:4927: checking for prefix of system macro packages" >&5 +echo "$as_me:4941: checking for prefix of system macro packages" >&5 echo $ECHO_N "checking for prefix of system macro packages... $ECHO_C" >&6 sys_tmac_prefix= sys_tmac_file_prefix= @@ -4941,11 +4955,11 @@ for d in /usr/share/lib/tmac /usr/lib/tmac; do done done done -echo "$as_me:4944: result: $sys_tmac_prefix" >&5 +echo "$as_me:4958: result: $sys_tmac_prefix" >&5 echo "${ECHO_T}$sys_tmac_prefix" >&6 tmac_wrap= -echo "$as_me:4948: checking which system macro packages should be made available" >&5 +echo "$as_me:4962: checking which system macro packages should be made available" >&5 echo $ECHO_N "checking which system macro packages should be made available... $ECHO_C" >&6 if test "x$sys_tmac_file_prefix" = "xtmac."; then for f in $sys_tmac_prefix*; do @@ -4981,7 +4995,7 @@ elif test -n "$sys_tmac_prefix"; then done rm -f conftest.sol fi -echo "$as_me:4984: result: $tmac_wrap" >&5 +echo "$as_me:4998: result: $tmac_wrap" >&5 echo "${ECHO_T}$tmac_wrap" >&6 ac_config_files="$ac_config_files stamp-h" @@ -5067,7 +5081,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:5070: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:5084: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -5240,7 +5254,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:5243: error: ambiguous option: $1 + { { echo "$as_me:5257: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -5259,7 +5273,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:5262: error: unrecognized option: $1 + -*) { { echo "$as_me:5276: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -5298,7 +5312,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/xditview/Imakefile" ) CONFIG_FILES="$CONFIG_FILES src/xditview/Imakefile" ;; "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;; - *) { { echo "$as_me:5301: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:5315: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -5528,7 +5542,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:5531: creating $ac_file" >&5 + { echo "$as_me:5545: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5546,7 +5560,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5549: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5563: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5559,7 +5573,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5562: error: cannot find input file: $f" >&5 + { { echo "$as_me:5576: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5624,7 +5638,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:5627: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:5641: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -5635,7 +5649,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5638: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5652: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5648,7 +5662,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5651: error: cannot find input file: $f" >&5 + { { echo "$as_me:5665: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5765,7 +5779,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:5768: $ac_file is unchanged" >&5 + { echo "$as_me:5782: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -5832,7 +5846,7 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi -{ echo "$as_me:5835: +{ echo "$as_me:5849: Configuration completed. diff --git a/doc/homepage.ms b/doc/homepage.ms index d411c6d2..1dcf9776 100755 --- a/doc/homepage.ms +++ b/doc/homepage.ms @@ -9,9 +9,15 @@ .nr VS 12 .if '\*[.T]'html' .nr LL 10i .if r ps4html .nr LL 10i -.LP .mso www.tmac . +.de blm-macro +. nr tmp \\n[.i] +. LP +. in \\n[tmp]u +.. +.blm blm-macro +. .HX 0 . .defcolor darkred rgb 0.65f 0.1f 0.2f @@ -41,7 +47,7 @@ Hosted by .HR .HnE .LK -.LP + .DC T HE darkred groff (GNU Troff) software is a typesetting package which reads plain text mixed with @@ -53,17 +59,17 @@ Groff now supports HTML. . .SH Download -.LP + .URL "ftp://\:groff.ffii.org/\:pub/\:groff/" Germany | .URL "ftp://\:ftp.gnu.org/\:gnu/\:groff/" USA -.LP + .URL http://\:www.gnu.org/\:copyleft/\:gpl.html License | .URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ "Mailing list" | .URL "http://\:www.cs.vu.nl/\:~tmgil/\:misc/\:wingroff.html" "Groff for Windows" -.sp + User issues lead: .MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding" .br @@ -73,10 +79,10 @@ Technical issues lead: . .SH README -.LP + This is the GNU groff document formatting system. The version number is given in the file VERSION. -.LP + Included in this release are implementations of troff, pic, eqn, tbl, refer, the -man macros and the -ms macros, and drivers for PostScript, TeX dvi format, HP LaserJet 4 printers, HTML format (still alpha), and @@ -85,28 +91,28 @@ Also included is a modified version of the Berkeley -me macros, an enhanced version of the X11 xditview previewer, and an implementation of the -mm macros contributed by .MTO jh@\:axis.se "J\(:orgen H\(:agg" . -.LP + See the file INSTALL for installation instructions. You will require a C++ compiler. -.LP + The file NEWS describes recent user-visible changes to groff. -.LP + Groff is free software. See the file COPYING for copying permission. -.LP + The file PROBLEMS describes various problems that have been encountered in compiling, installing, and running groff. -.LP + For the moment, the documentation assumes that you are already familiar with the Unix versions of troff, -man, -ms and the preprocessors. -.LP + The most recent released version of groff is always available by anonymous ftp from ftp.gnu.org in the directory pub/\:gnu/\:groff. -.LP + A CVS repository is now available, containing the current development version of groff. You can access it with the commands: -.sp + .RS .nf .ft C @@ -116,33 +122,30 @@ cvs -z9 co groff .ft P .fi .RE -.sp -.LP + (if the prompt for the password appears, just press the enter key). After a successful login you no longer need the first two commands; an update of a checked out repository should be done with: -.sp + .RS .ft C cvs -z9 update -dP .ft P .RE -.sp -.LP + Please read the info pages of cvs for further details. -.LP + Alternatively, you can download snapshots (which are updated twice a day) from .URL ftp://\:ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz here or a diff file relative to the latest official groff release as: -.sp + .RS .ft C ftp://ftp.ffii.org/pub/groff/devel/groff-[version]-current.diff.gz .ft P .RE -.sp -.LP + Please report bugs using the form in the file BUG-REPORT; the idea of this is to make sure that FSF has all the information it needs to fix the bug. At the very least, read the BUG-REPORT form and make sure that you supply @@ -150,31 +153,32 @@ all the information that it asks for. Even if you are not sure that something is a bug, report it using BUG-REPORT: this will enable us to determine whether it really is a bug or not. -.LP + Three mailing lists are available: -.sp + .ULS .LI .MTO bug-groff@gnu.org bug-groff@gnu.org for reporting bugs + .LI .MTO groff@gnu.org groff@gnu.org for general discussion of groff + .LI .MTO groff-commit@ffii.org groff-commit@ffii.org a read-only list showing logs of commitments to the CVS repository .ULE -.sp -.LP + Note that groff@gnu.org is an alias for .MTO groff@\:ffii.org groff@\:ffii.org ; you must be subscribed to the `groff' and `groff-commit' lists to send mails. -.LP + To subscribe, send e-mail to [list]-request@[domain] (example: .MTO groff-request@\:ffii.org groff-request@\:ffii.org ) with the word `subscribe' in either the subject or body of the e-mail (don't include the quotes). -.LP + GNU groff was written by .MTO jjc@\:jclark.com "James Clark" . It is now maintained by @@ -187,14 +191,14 @@ and . .SH NEWS VERSION 1.18 -.LP + This section describes recent user-visible changes in groff. Bug fixes are not described. There are more details in the man pages. . . .SH 2 Troff -.LP + .ULS .LI Color support has been added to troff and pic (and to two device drivers, @@ -214,12 +218,13 @@ is defined (with .if and .ie), a new conditional operator `m' is available. More details can be found in the troff manual page. + .LI It is now possible to have whitespace between the first and second dot (or the name of the ending macro) to end a macro definition. Example: .RS .nf -\fC\c +.ft C \&.de ! \&.. \&. @@ -229,12 +234,15 @@ the name of the ending macro) to end a macro definition. Example: \&. de bar ! \&. nop Hello, I'm `bar'. \&. ! -\&..\fP +\&.. +.ft P .fi .RE + .LI `.fn' is a new string-valued register which returns the (internal) real font name; styles and families are properly concatenated. + .LI The new request `fchar' can be used to provide fallback characters. Its syntax is the same as the `char' request; the only difference is that a @@ -242,28 +250,36 @@ character defined with `.char' hides the glyph with the same name in the current font, whereas a character defined with `.fchar' is checked only if the particular glyph isn't found in the current font. This test happens before checking special fonts. + .LI The new request `itc' is a variant of `.it' for which a line interrupted with \ec counts as one input line. + .LI A new escape sequence `\eO' is available (mainly for internal use with grohtml). Please see groff_diff.man and groff.texinfo for more details. + .LI Two macros `AT' (AT&T) and `UC' (Univ. of California) have been added to the man macros for compatibility with older BSD releases. + .LI The `-xwidth' specifier in the mdoc macro package has been removed. Its functionality is now integrated directly into `-width'. Similarly, `-column' has been extended to has this functionality also. + .LI A new macro `Ex' has been added to the mdoc macro package to document an exit status. + .LI `troff.man' has been split. Differences to UNIX troff are now documented in the new man page `groff_diff.man'. + .LI groff_mwww.man' has been renamed to `groff_www.man'. The file mwww.tmac has been removed. + .LI The macro `NO-AUTO-RULE' has been added to www.tmac; it suppresses the generation of top and bottom rules which grohtml emits by default. @@ -272,7 +288,7 @@ generation of top and bottom rules which grohtml emits by default. . .SH 2 groff -.LP + .ULS .LI The new command line `-c' disables color output (which is always disabled @@ -282,7 +298,7 @@ in compatibility mode). . .SH 2 pic -.LP + .ULS .LI New keywords `color' (or `colour', `colored', `coloured'), `outline' (or @@ -297,7 +313,7 @@ Color support for TeX output is not implemented yet. . .SH 2 Pic2graph -.LP + .ULS .LI A new script contributed by Eric S. Raymond <esr@thyrsus.com>. It @@ -308,7 +324,7 @@ library, virtually all graphics formats are available for output. . .SH 2 grops -.LP + .ULS .LI Color support has been added. @@ -317,10 +333,11 @@ Color support has been added. . .SH 2 grohtml -.LP + .ULS .LI Color support for glyphs has been added. + .LI New option `\fC-h\fP' to select the style of headings in HTML output. .ULE @@ -328,7 +345,7 @@ New option `\fC-h\fP' to select the style of headings in HTML output. . .SH 2 Miscellaneous -.LP + .ULS .LI A new manual page `\fCditroff.7\fP' is available. diff --git a/src/devices/grodvi/dvi.cc b/src/devices/grodvi/dvi.cc index 9e80b266..84126366 100644 --- a/src/devices/grodvi/dvi.cc +++ b/src/devices/grodvi/dvi.cc @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001 +/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) @@ -44,8 +44,6 @@ width in the tfm file. */ #define SIZESCALE 100 #define MULTIPLIER 1 -#define FILL_MAX 1000 - class dvi_font : public font { dvi_font(const char *); public: @@ -123,6 +121,7 @@ class dvi_printer : public printer { output_font output_font_table[FONTS_MAX]; font *cur_font; int cur_point_size; + color cur_color; int pushed; int pushed_h; int pushed_v; @@ -132,6 +131,7 @@ class dvi_printer : public printer { void define_font(int); void set_font(int); void possibly_begin_line(); + void set_color(color *); protected: enum { id_byte = 2, @@ -179,9 +179,8 @@ public: class draw_dvi_printer : public dvi_printer { int output_pen_size; - int fill; void set_line_thickness(const environment *); - void fill_next(); + void fill_next(const environment *); public: draw_dvi_printer(); ~draw_dvi_printer(); @@ -214,7 +213,7 @@ dvi_printer::~dvi_printer() draw_dvi_printer::draw_dvi_printer() -: output_pen_size(-1), fill(FILL_MAX) +: output_pen_size(-1) { } @@ -302,9 +301,45 @@ int scale(int x, int z) return sw; } +void dvi_printer::set_color(color *col) +{ + cur_color = *col; + char buf[256]; + unsigned int components[4]; + color_scheme cs = col->get_components(components); + switch (cs) { + case DEFAULT: + sprintf(buf, "color gray 0"); + break; + case RGB: + sprintf(buf, "color rgb %.3g %.3g %.3g", + double(Red) / color::MAX_COLOR_VAL, + double(Green) / color::MAX_COLOR_VAL, + double(Blue) / color::MAX_COLOR_VAL); + break; + case CMY: + col->get_cmyk(&Cyan, &Magenta, &Yellow, &Black); + // fall through + case CMYK: + sprintf(buf, "color cmyk %.3g %.3g %.3g %.3g", + double(Cyan) / color::MAX_COLOR_VAL, + double(Magenta) / color::MAX_COLOR_VAL, + double(Yellow) / color::MAX_COLOR_VAL, + double(Black) / color::MAX_COLOR_VAL); + break; + case GRAY: + sprintf(buf, "color gray %.3g", + double(Gray) / color::MAX_COLOR_VAL); + break; + } + do_special(buf); +} -void dvi_printer::set_char(int index, font *f, const environment *env, int w, const char *name) +void dvi_printer::set_char(int index, font *f, const environment *env, + int w, const char *name) { + if (*env->col != cur_color) + set_color(env->col); int code = f->get_code(index); if (env->size != cur_point_size || f != cur_font) { cur_font = f; @@ -345,7 +380,7 @@ void dvi_printer::set_char(int index, font *f, const environment *env, int w, co possibly_begin_line(); end_h = env->hpos + w; cur_h += scale(f->get_width(index, UNITWIDTH)/MULTIPLIER, - cur_point_size*RES_7227); + cur_point_size*RES_7227); if (cur_h > max_h) max_h = cur_h; if (cur_v > max_v) @@ -464,6 +499,8 @@ void dvi_printer::begin_page(int i) out4(0); out4(last_bop); last_bop = tem; + if (cur_color != default_color) + set_color(&cur_color); // By convention position (0,0) in a dvi file is placed at (1in, 1in). cur_h = font::res; cur_v = font::res; @@ -472,6 +509,7 @@ void dvi_printer::begin_page(int i) void dvi_printer::end_page(int) { + set_color(&default_color); if (pushed) end_of_line(); out1(eop); @@ -629,10 +667,17 @@ void draw_dvi_printer::set_line_thickness(const environment *env) } } -void draw_dvi_printer::fill_next() +void draw_dvi_printer::fill_next(const environment *env) { + unsigned int g; + if (env->fill->is_default()) + g = 0; + else { + // currently, only BW support + env->fill->get_gray(&g); + } char buf[256]; - sprintf(buf, "sh %.3f", double(fill)/FILL_MAX); + sprintf(buf, "sh %.3g", 1 - double(g)/color::MAX_COLOR_VAL); do_special(buf); } @@ -652,7 +697,7 @@ void draw_dvi_printer::draw(int code, int *p, int np, const environment *env) } moveto(env->hpos+p[0]/2, env->vpos); if (fill_flag) - fill_next(); + fill_next(env); else set_line_thickness(env); int rad; @@ -685,7 +730,7 @@ void draw_dvi_printer::draw(int code, int *p, int np, const environment *env) } moveto(env->hpos+p[0]/2, env->vpos); if (fill_flag) - fill_next(); + fill_next(env); sprintf(buf, "%s 0 0 %d %d 0 6.28319", (fill_flag ? "ia" : "ar"), milliinches(p[0]/2), @@ -707,7 +752,7 @@ void draw_dvi_printer::draw(int code, int *p, int np, const environment *env) } moveto(env->hpos, env->vpos); if (fill_flag) - fill_next(); + fill_next(env); else set_line_thickness(env); do_special("pa 0 0"); @@ -790,20 +835,6 @@ void draw_dvi_printer::draw(int code, int *p, int np, const environment *env) } break; } - case 'f': - { - if (np != 1 && np != 2) { - error("1 argument required for fill"); - break; - } - fill = p[0]; - if (fill < 0 || fill > FILL_MAX) - fill = FILL_MAX; - break; - } - case 'F': - // not implemented yet - break; case 'R': { if (np != 2) { diff --git a/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.man index 0a21d454..3704c2ec 100644 --- a/src/devices/grodvi/grodvi.man +++ b/src/devices/grodvi/grodvi.man @@ -137,6 +137,17 @@ These are automatically generated by .B tfmtodit. . .LP +The default color for +.B \[rs]m +and +.B \[rs]M +is black. +. +Currently, the drawing color for +.B \[rs]D +commands is always black, and fill color values are translated to gray. +. +.LP In .B troff the diff --git a/src/devices/grops/ps.cc b/src/devices/grops/ps.cc index 2d6abf93..07aa8ae3 100644 --- a/src/devices/grops/ps.cc +++ b/src/devices/grops/ps.cc @@ -1144,11 +1144,14 @@ void ps_printer::begin_page(int n) out.simple_comment("BeginPageSetup") .put_symbol("BP") .simple_comment("EndPageSetup"); + if (sbuf_color != default_color) + set_color(&sbuf_color); } void ps_printer::end_page(int) { flush_sbuf(); + set_color(&default_color); out.put_symbol("EP"); if (invis_count != 0) { error("missing `endinvis' command"); diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index a3d77013..72bf8c7f 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -514,11 +514,23 @@ . HTML-IMAGE-END .. . +.de1 R +\c +. ie \\n[.$] \{\ +. tm `R' is a string (producing the registered sign), not a macro. +. nop \\$* +. \} +. el \{\ +. ie c\[rg] \ +. nop \[rg]\c +. el \ +. nop (Reg.)\c +. \} +.. +. .\" these strings must work in compatibility mode also . .ds S \s'\\n(PSu' -.ie c\[rg] .ds R \(rg -.el .ds R (Reg.) .ie c\[tm] .ds Tm \(tm .el .ds Tm (TM) .ds lq \(lq diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac index 90981dc8..818c604a 100644 --- a/tmac/dvi.tmac +++ b/tmac/dvi.tmac @@ -154,5 +154,554 @@ D\v'-.33m'\s0\v'.33m' .hcode \[,C]c .if !c\[,c] .char \[,c] \o'\[ac]c' .hcode \[,c]c +.\" now for color definitions +.\" +.\" this is a composite of MIT's X Consortium red/green/blue (rgb) color +.\" specifications, X Consortium version 10.41, 1994. +.\" +.defcolor black rgb #000000 +.defcolor grey rgb #bebebe +.defcolor dimgrey rgb #696969 +.defcolor lightgray rgb #d3d3d3 +.defcolor lightslategrey rgb #778899 +.defcolor slategray rgb #708090 +.defcolor slategray1 rgb #c6e2ff +.defcolor slategray2 rgb #b9d3ee +.defcolor slategray3 rgb #9fb6cd +.defcolor slategray4 rgb #6c7b8b +.defcolor slategrey rgb #708090 +.defcolor grey0 rgb #000000 +.defcolor grey1 rgb #030303 +.defcolor grey2 rgb #050505 +.defcolor grey3 rgb #080808 +.defcolor grey4 rgb #0a0a0a +.defcolor grey5 rgb #0d0d0d +.defcolor grey6 rgb #0f0f0f +.defcolor grey7 rgb #121212 +.defcolor grey8 rgb #141414 +.defcolor grey9 rgb #171717 +.defcolor grey10 rgb #1a1a1a +.defcolor grey11 rgb #1c1c1c +.defcolor grey12 rgb #1f1f1f +.defcolor grey13 rgb #212121 +.defcolor grey14 rgb #242424 +.defcolor grey15 rgb #262626 +.defcolor grey16 rgb #292929 +.defcolor grey17 rgb #2b2b2b +.defcolor grey18 rgb #2e2e2e +.defcolor grey19 rgb #303030 +.defcolor grey20 rgb #333333 +.defcolor grey21 rgb #363636 +.defcolor grey22 rgb #383838 +.defcolor grey23 rgb #3b3b3b +.defcolor grey24 rgb #3d3d3d +.defcolor grey25 rgb #404040 +.defcolor grey26 rgb #424242 +.defcolor grey27 rgb #454545 +.defcolor grey28 rgb #474747 +.defcolor grey29 rgb #4a4a4a +.defcolor grey30 rgb #4d4d4d +.defcolor grey31 rgb #4f4f4f +.defcolor grey32 rgb #525252 +.defcolor grey33 rgb #545454 +.defcolor grey34 rgb #575757 +.defcolor grey35 rgb #595959 +.defcolor grey36 rgb #5c5c5c +.defcolor grey37 rgb #5e5e5e +.defcolor grey38 rgb #616161 +.defcolor grey39 rgb #636363 +.defcolor grey40 rgb #666666 +.defcolor grey41 rgb #696969 +.defcolor grey42 rgb #6b6b6b +.defcolor grey43 rgb #6e6e6e +.defcolor grey44 rgb #707070 +.defcolor grey45 rgb #737373 +.defcolor grey46 rgb #757575 +.defcolor grey47 rgb #787878 +.defcolor grey48 rgb #7a7a7a +.defcolor grey49 rgb #7d7d7d +.defcolor grey50 rgb #7f7f7f +.defcolor grey51 rgb #828282 +.defcolor grey52 rgb #858585 +.defcolor grey53 rgb #878787 +.defcolor grey54 rgb #8a8a8a +.defcolor grey55 rgb #8c8c8c +.defcolor grey56 rgb #8f8f8f +.defcolor grey57 rgb #919191 +.defcolor grey58 rgb #949494 +.defcolor grey59 rgb #969696 +.defcolor grey60 rgb #999999 +.defcolor grey61 rgb #9c9c9c +.defcolor grey62 rgb #9e9e9e +.defcolor grey63 rgb #a1a1a1 +.defcolor grey64 rgb #a3a3a3 +.defcolor grey65 rgb #a6a6a6 +.defcolor grey66 rgb #a8a8a8 +.defcolor grey67 rgb #ababab +.defcolor grey68 rgb #adadad +.defcolor grey69 rgb #b0b0b0 +.defcolor grey70 rgb #b3b3b3 +.defcolor grey71 rgb #b5b5b5 +.defcolor grey72 rgb #b8b8b8 +.defcolor grey73 rgb #bababa +.defcolor grey74 rgb #bdbdbd +.defcolor grey75 rgb #bfbfbf +.defcolor grey76 rgb #c2c2c2 +.defcolor grey77 rgb #c4c4c4 +.defcolor grey78 rgb #c7c7c7 +.defcolor grey79 rgb #c9c9c9 +.defcolor grey80 rgb #cccccc +.defcolor grey81 rgb #cfcfcf +.defcolor grey82 rgb #d1d1d1 +.defcolor grey83 rgb #d4d4d4 +.defcolor grey84 rgb #d6d6d6 +.defcolor grey85 rgb #d9d9d9 +.defcolor grey86 rgb #dbdbdb +.defcolor grey87 rgb #dedede +.defcolor grey88 rgb #e0e0e0 +.defcolor grey89 rgb #e3e3e3 +.defcolor grey90 rgb #e5e5e5 +.defcolor grey91 rgb #e8e8e8 +.defcolor grey92 rgb #ebebeb +.defcolor grey93 rgb #ededed +.defcolor grey94 rgb #f0f0f0 +.defcolor grey95 rgb #f2f2f2 +.defcolor grey96 rgb #f5f5f5 +.defcolor grey97 rgb #f7f7f7 +.defcolor grey98 rgb #fafafa +.defcolor grey99 rgb #fcfcfc +.defcolor grey100 rgb #ffffff +.defcolor aliceblue rgb #f0f8ff +.defcolor blueviolet rgb #8a2be2 +.defcolor cadetblue rgb #5f9ea0 +.defcolor cadetblue1 rgb #98f5ff +.defcolor cadetblue2 rgb #8ee5ee +.defcolor cadetblue3 rgb #7ac5cd +.defcolor cadetblue4 rgb #53868b +.defcolor cornflowerblue rgb #6495ed +.defcolor darkslateblue rgb #483d8b +.defcolor darkturquoise rgb #00ced1 +.defcolor deepskyblue rgb #00bfff +.defcolor deepskyblue1 rgb #00bfff +.defcolor deepskyblue2 rgb #00b2ee +.defcolor deepskyblue3 rgb #009acd +.defcolor deepskyblue4 rgb #00688b +.defcolor dodgerblue rgb #1e90ff +.defcolor dodgerblue1 rgb #1e90ff +.defcolor dodgerblue2 rgb #1c86ee +.defcolor dodgerblue3 rgb #1874cd +.defcolor dodgerblue4 rgb #104e8b +.defcolor lightblue rgb #add8e6 +.defcolor lightblue1 rgb #bfefff +.defcolor lightblue2 rgb #b2dfee +.defcolor lightblue3 rgb #9ac0cd +.defcolor lightblue4 rgb #68838b +.defcolor lightcyan rgb #e0ffff +.defcolor lightcyan1 rgb #e0ffff +.defcolor lightcyan2 rgb #d1eeee +.defcolor lightcyan3 rgb #b4cdcd +.defcolor lightcyan4 rgb #7a8b8b +.defcolor lightskyblue rgb #87cefa +.defcolor lightskyblue1 rgb #b0e2ff +.defcolor lightskyblue2 rgb #a4d3ee +.defcolor lightskyblue3 rgb #8db6cd +.defcolor lightskyblue4 rgb #607b8b +.defcolor lightslateblue rgb #8470ff +.defcolor lightsteelblue rgb #b0c4de +.defcolor lightsteelblue1 rgb #cae1ff +.defcolor lightsteelblue2 rgb #bcd2ee +.defcolor lightsteelblue3 rgb #a2b5cd +.defcolor lightsteelblue4 rgb #6e7b8b +.defcolor mediumaquamarine rgb #66cdaa +.defcolor mediumblue rgb #0000cd +.defcolor mediumslateblue rgb #7b68ee +.defcolor mediumturquoise rgb #48d1cc +.defcolor midnightblue rgb #191970 +.defcolor navyblue rgb #000080 +.defcolor paleturquoise rgb #afeeee +.defcolor paleturquoise1 rgb #bbffff +.defcolor paleturquoise2 rgb #aeeeee +.defcolor paleturquoise3 rgb #96cdcd +.defcolor paleturquoise4 rgb #668b8b +.defcolor powderblue rgb #b0e0e6 +.defcolor royalblue rgb #4169e1 +.defcolor royalblue1 rgb #4876ff +.defcolor royalblue2 rgb #436eee +.defcolor royalblue3 rgb #3a5fcd +.defcolor royalblue4 rgb #27408b +.defcolor skyblue rgb #87ceeb +.defcolor skyblue1 rgb #87ceff +.defcolor skyblue2 rgb #7ec0ee +.defcolor skyblue3 rgb #6ca6cd +.defcolor skyblue4 rgb #4a708b +.defcolor slateblue rgb #6a5acd +.defcolor slateblue1 rgb #836fff +.defcolor slateblue2 rgb #7a67ee +.defcolor slateblue3 rgb #6959cd +.defcolor slateblue4 rgb #473c8b +.defcolor steelblue rgb #4682b4 +.defcolor steelblue1 rgb #63b8ff +.defcolor steelblue2 rgb #5cacee +.defcolor steelblue3 rgb #4f94cd +.defcolor steelblue4 rgb #36648b +.defcolor aquamarine rgb #7fffd4 +.defcolor aquamarine1 rgb #7fffd4 +.defcolor aquamarine2 rgb #76eec6 +.defcolor aquamarine3 rgb #66cdaa +.defcolor aquamarine4 rgb #458b74 +.defcolor azure rgb #f0ffff +.defcolor azure1 rgb #f0ffff +.defcolor azure2 rgb #e0eeee +.defcolor azure3 rgb #c1cdcd +.defcolor azure4 rgb #838b8b +.defcolor blue rgb #0000ff +.defcolor blue1 rgb #0000ff +.defcolor blue2 rgb #0000ee +.defcolor blue3 rgb #0000cd +.defcolor blue4 rgb #00008b +.defcolor cyan rgb #00ffff +.defcolor cyan1 rgb #00ffff +.defcolor cyan2 rgb #00eeee +.defcolor cyan3 rgb #00cdcd +.defcolor cyan4 rgb #008b8b +.defcolor navy rgb #000080 +.defcolor turquoise rgb #40e0d0 +.defcolor turquoise1 rgb #00f5ff +.defcolor turquoise2 rgb #00e5ee +.defcolor turquoise3 rgb #00c5cd +.defcolor turquoise4 rgb #00868b +.defcolor darkslategray rgb #2f4f4f +.defcolor darkslategray1 rgb #97ffff +.defcolor darkslategray2 rgb #8deeee +.defcolor darkslategray3 rgb #79cdcd +.defcolor darkslategray4 rgb #528b8b +.defcolor rosybrown rgb #bc8f8f +.defcolor rosybrown1 rgb #ffc1c1 +.defcolor rosybrown2 rgb #eeb4b4 +.defcolor rosybrown3 rgb #cd9b9b +.defcolor rosybrown4 rgb #8b6969 +.defcolor saddlebrown rgb #8b4513 +.defcolor sandybrown rgb #f4a460 +.defcolor beige rgb #f5f5dc +.defcolor brown rgb #a52a2a +.defcolor brown1 rgb #ff4040 +.defcolor brown2 rgb #ee3b3b +.defcolor brown3 rgb #cd3333 +.defcolor brown4 rgb #8b2323 +.defcolor burlywood rgb #deb887 +.defcolor burlywood1 rgb #ffd39b +.defcolor burlywood2 rgb #eec591 +.defcolor burlywood3 rgb #cdaa7d +.defcolor burlywood4 rgb #8b7355 +.defcolor chocolate rgb #d2691e +.defcolor chocolate1 rgb #ff7f24 +.defcolor chocolate2 rgb #ee7621 +.defcolor chocolate3 rgb #cd661d +.defcolor chocolate4 rgb #8b4513 +.defcolor peru rgb #cd853f +.defcolor tan rgb #d2b48c +.defcolor tan1 rgb #ffa54f +.defcolor tan2 rgb #ee9a49 +.defcolor tan3 rgb #cd853f +.defcolor tan4 rgb #8b5a2b +.defcolor darkgreen rgb #006400 +.defcolor darkkhaki rgb #bdb76b +.defcolor darkolivegreen rgb #556b2f +.defcolor darkolivegreen1 rgb #caff70 +.defcolor darkolivegreen2 rgb #bcee68 +.defcolor darkolivegreen3 rgb #a2cd5a +.defcolor darkolivegreen4 rgb #6e8b3d +.defcolor darkseagreen rgb #8fbc8f +.defcolor darkseagreen1 rgb #c1ffc1 +.defcolor darkseagreen2 rgb #b4eeb4 +.defcolor darkseagreen3 rgb #9bcd9b +.defcolor darkseagreen4 rgb #698b69 +.defcolor forestgreen rgb #228b22 +.defcolor greenyellow rgb #adff2f +.defcolor lawngreen rgb #7cfc00 +.defcolor lightseagreen rgb #20b2aa +.defcolor limegreen rgb #32cd32 +.defcolor mediumseagreen rgb #3cb371 +.defcolor mediumspringgreen rgb #00fa9a +.defcolor mintcream rgb #f5fffa +.defcolor olivedrab rgb #6b8e23 +.defcolor olivedrab1 rgb #c0ff3e +.defcolor olivedrab2 rgb #b3ee3a +.defcolor olivedrab3 rgb #9acd32 +.defcolor olivedrab4 rgb #698b22 +.defcolor palegreen rgb #98fb98 +.defcolor palegreen1 rgb #9aff9a +.defcolor palegreen2 rgb #90ee90 +.defcolor palegreen3 rgb #7ccd7c +.defcolor palegreen4 rgb #548b54 +.defcolor seagreen rgb #2e8b57 +.defcolor seagreen1 rgb #54ff9f +.defcolor seagreen2 rgb #4eee94 +.defcolor seagreen3 rgb #43cd80 +.defcolor seagreen4 rgb #2e8b57 +.defcolor springgreen rgb #00ff7f +.defcolor springgreen1 rgb #00ff7f +.defcolor springgreen2 rgb #00ee76 +.defcolor springgreen3 rgb #00cd66 +.defcolor springgreen4 rgb #008b45 +.defcolor yellowgreen rgb #9acd32 +.defcolor chartreuse rgb #7fff00 +.defcolor chartreuse1 rgb #7fff00 +.defcolor chartreuse2 rgb #76ee00 +.defcolor chartreuse3 rgb #66cd00 +.defcolor chartreuse4 rgb #458b00 +.defcolor green rgb #00ff00 +.defcolor green1 rgb #00ff00 +.defcolor green2 rgb #00ee00 +.defcolor green3 rgb #00cd00 +.defcolor green4 rgb #008b00 +.defcolor khaki rgb #f0e68c +.defcolor khaki1 rgb #fff68f +.defcolor khaki2 rgb #eee685 +.defcolor khaki3 rgb #cdc673 +.defcolor khaki4 rgb #8b864e +.defcolor darkorange rgb #ff8c00 +.defcolor darkorange1 rgb #ff7f00 +.defcolor darkorange2 rgb #ee7600 +.defcolor darkorange3 rgb #cd6600 +.defcolor darkorange4 rgb #8b4500 +.defcolor darksalmon rgb #e9967a +.defcolor lightcoral rgb #f08080 +.defcolor lightsalmon rgb #ffa07a +.defcolor lightsalmon1 rgb #ffa07a +.defcolor lightsalmon2 rgb #ee9572 +.defcolor lightsalmon3 rgb #cd8162 +.defcolor lightsalmon4 rgb #8b5742 +.defcolor peachpuff rgb #ffdab9 +.defcolor peachpuff1 rgb #ffdab9 +.defcolor peachpuff2 rgb #eecbad +.defcolor peachpuff3 rgb #cdaf95 +.defcolor peachpuff4 rgb #8b7765 +.defcolor bisque rgb #ffe4c4 +.defcolor bisque1 rgb #ffe4c4 +.defcolor bisque2 rgb #eed5b7 +.defcolor bisque3 rgb #cdb79e +.defcolor bisque4 rgb #8b7d6b +.defcolor coral rgb #ff7f50 +.defcolor coral1 rgb #ff7256 +.defcolor coral2 rgb #ee6a50 +.defcolor coral3 rgb #cd5b45 +.defcolor coral4 rgb #8b3e2f +.defcolor honeydew rgb #f0fff0 +.defcolor honeydew1 rgb #f0fff0 +.defcolor honeydew2 rgb #e0eee0 +.defcolor honeydew3 rgb #c1cdc1 +.defcolor honeydew4 rgb #838b83 +.defcolor orange rgb #ffa500 +.defcolor orange1 rgb #ffa500 +.defcolor orange2 rgb #ee9a00 +.defcolor orange3 rgb #cd8500 +.defcolor orange4 rgb #8b5a00 +.defcolor salmon rgb #fa8072 +.defcolor salmon1 rgb #ff8c69 +.defcolor salmon2 rgb #ee8262 +.defcolor salmon3 rgb #cd7054 +.defcolor salmon4 rgb #8b4c39 +.defcolor sienna rgb #a0522d +.defcolor sienna1 rgb #ff8247 +.defcolor sienna2 rgb #ee7942 +.defcolor sienna3 rgb #cd6839 +.defcolor sienna4 rgb #8b4726 +.defcolor deeppink rgb #ff1493 +.defcolor deeppink1 rgb #ff1493 +.defcolor deeppink2 rgb #ee1289 +.defcolor deeppink3 rgb #cd1076 +.defcolor deeppink4 rgb #8b0a50 +.defcolor hotpink rgb #ff69b4 +.defcolor hotpink1 rgb #ff6eb4 +.defcolor hotpink2 rgb #ee6aa7 +.defcolor hotpink3 rgb #cd6090 +.defcolor hotpink4 rgb #8b3a62 +.defcolor indianred rgb #cd5c5c +.defcolor indianred1 rgb #ff6a6a +.defcolor indianred2 rgb #ee6363 +.defcolor indianred3 rgb #cd5555 +.defcolor indianred4 rgb #8b3a3a +.defcolor lightpink rgb #ffb6c1 +.defcolor lightpink1 rgb #ffaeb9 +.defcolor lightpink2 rgb #eea2ad +.defcolor lightpink3 rgb #cd8c95 +.defcolor lightpink4 rgb #8b5f65 +.defcolor mediumvioletred rgb #c71585 +.defcolor mistyrose rgb #ffe4e1 +.defcolor mistyrose1 rgb #ffe4e1 +.defcolor mistyrose2 rgb #eed5d2 +.defcolor mistyrose3 rgb #cdb7b5 +.defcolor mistyrose4 rgb #8b7d7b +.defcolor orangered rgb #ff4500 +.defcolor orangered1 rgb #ff4500 +.defcolor orangered2 rgb #ee4000 +.defcolor orangered3 rgb #cd3700 +.defcolor orangered4 rgb #8b2500 +.defcolor palevioletred rgb #db7093 +.defcolor palevioletred1 rgb #ff82ab +.defcolor palevioletred2 rgb #ee799f +.defcolor palevioletred3 rgb #cd6889 +.defcolor palevioletred4 rgb #8b475d +.defcolor violetred rgb #d02090 +.defcolor violetred1 rgb #ff3e96 +.defcolor violetred2 rgb #ee3a8c +.defcolor violetred3 rgb #cd3278 +.defcolor violetred4 rgb #8b2252 +.defcolor firebrick rgb #b22222 +.defcolor firebrick1 rgb #ff3030 +.defcolor firebrick2 rgb #ee2c2c +.defcolor firebrick3 rgb #cd2626 +.defcolor firebrick4 rgb #8b1a1a +.defcolor pink rgb #ffc0cb +.defcolor pink1 rgb #ffb5c5 +.defcolor pink2 rgb #eea9b8 +.defcolor pink3 rgb #cd919e +.defcolor pink4 rgb #8b636c +.defcolor red rgb #ff0000 +.defcolor red1 rgb #ff0000 +.defcolor red2 rgb #ee0000 +.defcolor red3 rgb #cd0000 +.defcolor red4 rgb #8b0000 +.defcolor tomato rgb #ff6347 +.defcolor tomato1 rgb #ff6347 +.defcolor tomato2 rgb #ee5c42 +.defcolor tomato3 rgb #cd4f39 +.defcolor tomato4 rgb #8b3626 +.defcolor darkorchid rgb #9932cc +.defcolor darkorchid1 rgb #bf3eff +.defcolor darkorchid2 rgb #b23aee +.defcolor darkorchid3 rgb #9a32cd +.defcolor darkorchid4 rgb #68228b +.defcolor darkviolet rgb #9400d3 +.defcolor lavenderblush rgb #fff0f5 +.defcolor lavenderblush1 rgb #fff0f5 +.defcolor lavenderblush2 rgb #eee0e5 +.defcolor lavenderblush3 rgb #cdc1c5 +.defcolor lavenderblush4 rgb #8b8386 +.defcolor mediumorchid rgb #ba55d3 +.defcolor mediumorchid1 rgb #e066ff +.defcolor mediumorchid2 rgb #d15fee +.defcolor mediumorchid3 rgb #b452cd +.defcolor mediumorchid4 rgb #7a378b +.defcolor mediumpurple rgb #9370db +.defcolor mediumpurple1 rgb #ab82ff +.defcolor mediumpurple2 rgb #9f79ee +.defcolor mediumpurple3 rgb #8968cd +.defcolor mediumpurple4 rgb #5d478b +.defcolor lavender rgb #e6e6fa +.defcolor magenta rgb #ff00ff +.defcolor magenta1 rgb #ff00ff +.defcolor magenta2 rgb #ee00ee +.defcolor magenta3 rgb #cd00cd +.defcolor magenta4 rgb #8b008b +.defcolor maroon rgb #b03060 +.defcolor maroon1 rgb #ff34b3 +.defcolor maroon2 rgb #ee30a7 +.defcolor maroon3 rgb #cd2990 +.defcolor maroon4 rgb #8b1c62 +.defcolor orchid rgb #da70d6 +.defcolor orchid1 rgb #ff83fa +.defcolor orchid2 rgb #ee7ae9 +.defcolor orchid3 rgb #cd69c9 +.defcolor orchid4 rgb #8b4789 +.defcolor plum rgb #dda0dd +.defcolor plum1 rgb #ffbbff +.defcolor plum2 rgb #eeaeee +.defcolor plum3 rgb #cd96cd +.defcolor plum4 rgb #8b668b +.defcolor purple rgb #a020f0 +.defcolor purple1 rgb #9b30ff +.defcolor purple2 rgb #912cee +.defcolor purple3 rgb #7d26cd +.defcolor purple4 rgb #551a8b +.defcolor thistle rgb #d8bfd8 +.defcolor thistle1 rgb #ffe1ff +.defcolor thistle2 rgb #eed2ee +.defcolor thistle3 rgb #cdb5cd +.defcolor thistle4 rgb #8b7b8b +.defcolor violet rgb #ee82ee +.defcolor antiquewhite rgb #faebd7 +.defcolor antiquewhite1 rgb #ffefdb +.defcolor antiquewhite2 rgb #eedfcc +.defcolor antiquewhite3 rgb #cdc0b0 +.defcolor antiquewhite4 rgb #8b8378 +.defcolor floralwhite rgb #fffaf0 +.defcolor ghostwhite rgb #f8f8ff +.defcolor navajowhite rgb #ffdead +.defcolor navajowhite1 rgb #ffdead +.defcolor navajowhite2 rgb #eecfa1 +.defcolor navajowhite3 rgb #cdb38b +.defcolor navajowhite4 rgb #8b795e +.defcolor oldlace rgb #fdf5e6 +.defcolor whitesmoke rgb #f5f5f5 +.defcolor gainsboro rgb #dcdcdc +.defcolor ivory rgb #fffff0 +.defcolor ivory1 rgb #fffff0 +.defcolor ivory2 rgb #eeeee0 +.defcolor ivory3 rgb #cdcdc1 +.defcolor ivory4 rgb #8b8b83 +.defcolor linen rgb #faf0e6 +.defcolor seashell rgb #fff5ee +.defcolor seashell1 rgb #fff5ee +.defcolor seashell2 rgb #eee5de +.defcolor seashell3 rgb #cdc5bf +.defcolor seashell4 rgb #8b8682 +.defcolor snow rgb #fffafa +.defcolor snow1 rgb #fffafa +.defcolor snow2 rgb #eee9e9 +.defcolor snow3 rgb #cdc9c9 +.defcolor snow4 rgb #8b8989 +.defcolor wheat rgb #f5deb3 +.defcolor wheat1 rgb #ffe7ba +.defcolor wheat2 rgb #eed8ae +.defcolor wheat3 rgb #cdba96 +.defcolor wheat4 rgb #8b7e66 +.defcolor white rgb #ffffff +.defcolor blanchedalmond rgb #ffebcd +.defcolor darkgoldenrod rgb #b8860b +.defcolor darkgoldenrod1 rgb #ffb90f +.defcolor darkgoldenrod2 rgb #eead0e +.defcolor darkgoldenrod3 rgb #cd950c +.defcolor darkgoldenrod4 rgb #8b6508 +.defcolor lemonchiffon rgb #fffacd +.defcolor lemonchiffon1 rgb #fffacd +.defcolor lemonchiffon2 rgb #eee9bf +.defcolor lemonchiffon3 rgb #cdc9a5 +.defcolor lemonchiffon4 rgb #8b8970 +.defcolor lightgoldenrod rgb #eedd82 +.defcolor lightgoldenrod1 rgb #ffec8b +.defcolor lightgoldenrod2 rgb #eedc82 +.defcolor lightgoldenrod3 rgb #cdbe70 +.defcolor lightgoldenrod4 rgb #8b814c +.defcolor lightgoldenrodyellow rgb #fafad2 +.defcolor lightyellow rgb #ffffe0 +.defcolor lightyellow1 rgb #ffffe0 +.defcolor lightyellow2 rgb #eeeed1 +.defcolor lightyellow3 rgb #cdcdb4 +.defcolor lightyellow4 rgb #8b8b7a +.defcolor palegoldenrod rgb #eee8aa +.defcolor papayawhip rgb #ffefd5 +.defcolor cornsilk rgb #fff8dc +.defcolor cornsilk1 rgb #fff8dc +.defcolor cornsilk2 rgb #eee8cd +.defcolor cornsilk3 rgb #cdc8b1 +.defcolor cornsilk4 rgb #8b8878 +.defcolor gold rgb #ffd700 +.defcolor gold1 rgb #ffd700 +.defcolor gold2 rgb #eec900 +.defcolor gold3 rgb #cdad00 +.defcolor gold4 rgb #8b7500 +.defcolor goldenrod rgb #daa520 +.defcolor goldenrod1 rgb #ffc125 +.defcolor goldenrod2 rgb #eeb422 +.defcolor goldenrod3 rgb #cd9b1d +.defcolor goldenrod4 rgb #8b6914 +.defcolor moccasin rgb #ffe4b5 +.defcolor yellow rgb #ffff00 +.defcolor yellow1 rgb #ffff00 +.defcolor yellow2 rgb #eeee00 +.defcolor yellow3 rgb #cdcd00 +.defcolor yellow4 rgb #8b8b00 .cp \n(_C .do mso latin1.tmac diff --git a/tmac/www.tmac b/tmac/www.tmac index f04e5f5e..29346478 100644 --- a/tmac/www.tmac +++ b/tmac/www.tmac @@ -412,6 +412,7 @@ .ds www-level2 \[sq]\ \ \" .ds www-level3 \[ci]\ \ \" .nr www-level 0 +.nr www-depth 0 . .\" .\" Auxiliary macro for ULS. @@ -428,7 +429,6 @@ . if !\\n[www-level] \ . www-error "trying to terminate a list which does not exist" . nr www-level -1 -. HTML "</ul>" .. .\" .\" ULS @@ -439,8 +439,11 @@ . www-push-level . ie \\n[www-html] \ . HTML "<ul>" -. el \ -. in +\w'\\*[www-level\\n[www-level]]'u +. el \{\ +. if (\\n[www-level] == 1) \ +. nr www-depth \\n[.i] +. nr www-depth +\w'\\*[www-level\\n[www-level]]'u +. \} .. .\" .\" ULE @@ -450,8 +453,10 @@ .de ULE . ie \\n[www-html] \ . HTML "</ul>" -. el \ -. in -\w'\\*[www-level\\n[www-level]]'u +. el \{\ +. nr www-depth -\w'\\*[www-level\\n[www-level]]'u +. in \\n[www-depth] +. \} . www-pop-level .. .\" @@ -463,6 +468,7 @@ . ie \\n[www-html] \ . HTML "<li>" . el \{\ +. in \\n[www-depth]u . ti -\w'\\*[www-level\\n[www-level]]'u . nop \\*[www-level\\n[www-level]]\c . \} |