From acf5afa20ed43bea15675b3b6e0ca789a31834be Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Apr 2024 10:52:02 +0000 Subject: [PATCH 01/20] ptexenc: Support upTeX new encoding for combining characters git-svn-id: svn://tug.org/texlive/trunk/Build@71091 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/ptexenc/ChangeLog | 8 + source/texk/ptexenc/c-auto.in | 2 +- source/texk/ptexenc/configure | 26 ++-- source/texk/ptexenc/ptexenc/unicode.h | 5 + source/texk/ptexenc/unicode.c | 210 +++++++++++++++++++++++++- source/texk/ptexenc/version.ac | 2 +- 6 files changed, 237 insertions(+), 16 deletions(-) diff --git a/source/texk/ptexenc/ChangeLog b/source/texk/ptexenc/ChangeLog index 7cbc7c057..3dc357806 100644 --- a/source/texk/ptexenc/ChangeLog +++ b/source/texk/ptexenc/ChangeLog @@ -1,3 +1,11 @@ +2024-04-27 TANAKA Takuji + + * unicode.c, ptexenc/unicode.h: + Add new functions UVS_* to support new encoding of upTeX + to {,de}compose characters with multiple codepoints. + * version.ac: Bump to 1.5.0/dev. + https://github.com/texjporg/tex-jp-build/issues/46 + 2024-03-10 Karl Berry * TL'24 release. diff --git a/source/texk/ptexenc/c-auto.in b/source/texk/ptexenc/c-auto.in index 4413ef571..dd8ea6dd1 100644 --- a/source/texk/ptexenc/c-auto.in +++ b/source/texk/ptexenc/c-auto.in @@ -6,7 +6,7 @@ #define PTEXENC_C_AUTO_H /* ptexenc: the version string. */ -#define PTEXENCVERSION "ptexenc version 1.4.6/dev" +#define PTEXENCVERSION "ptexenc version 1.5.0/dev" /* Define to 1 if the 'closedir' function returns void instead of int. */ #undef CLOSEDIR_VOID diff --git a/source/texk/ptexenc/configure b/source/texk/ptexenc/configure index 39b8f4bb9..ccfbd18eb 100755 --- a/source/texk/ptexenc/configure +++ b/source/texk/ptexenc/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for ptexenc 1.4.6/dev. +# Generated by GNU Autoconf 2.72 for ptexenc 1.5.0/dev. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ptexenc' PACKAGE_TARNAME='ptexenc' -PACKAGE_VERSION='1.4.6/dev' -PACKAGE_STRING='ptexenc 1.4.6/dev' +PACKAGE_VERSION='1.5.0/dev' +PACKAGE_STRING='ptexenc 1.5.0/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1363,7 +1363,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures ptexenc 1.4.6/dev to adapt to many kinds of systems. +'configure' configures ptexenc 1.5.0/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1434,7 +1434,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ptexenc 1.4.6/dev:";; + short | recursive ) echo "Configuration of ptexenc 1.5.0/dev:";; esac cat <<\_ACEOF @@ -1555,7 +1555,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ptexenc configure 1.4.6/dev +ptexenc configure 1.5.0/dev generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2097,7 +2097,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ptexenc $as_me 1.4.6/dev, which was +It was created by ptexenc $as_me 1.5.0/dev, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2875,10 +2875,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -PTEXENCVERSION=1.4.6/dev +PTEXENCVERSION=1.5.0/dev -PTEXENC_LT_VERSINFO=5:6:4 +PTEXENC_LT_VERSINFO=6:0:5 am__api_version='1.16' @@ -8664,7 +8664,7 @@ fi # Define the identity of the package. PACKAGE='ptexenc' - VERSION='1.4.6/dev' + VERSION='1.5.0/dev' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15005,7 +15005,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -ptexenc config.lt 1.4.6/dev +ptexenc config.lt 1.5.0/dev configured by $0, generated by GNU Autoconf 2.72. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16777,7 +16777,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ptexenc $as_me 1.4.6/dev, which was +This file was extended by ptexenc $as_me 1.5.0/dev, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16845,7 +16845,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ptexenc config.status 1.4.6/dev +ptexenc config.status 1.5.0/dev configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/source/texk/ptexenc/ptexenc/unicode.h b/source/texk/ptexenc/ptexenc/unicode.h index 09db49475..0326b3fa9 100644 --- a/source/texk/ptexenc/ptexenc/unicode.h +++ b/source/texk/ptexenc/ptexenc/unicode.h @@ -21,6 +21,11 @@ extern long PTENCDLL UCStoUTF8(long ucs); extern long UCStoUPTEX(long ucs); extern long UPTEXtoUCS(long uptex); +extern int UVS_get_codepoint_length(long ucv); +extern long UVS_get_codepoint_in_sequence(long ucv, int n); +extern long UVS_combine_code(long ucv, long uvs); +extern long UVS_divide_code(long code, long* uvs); + #define LONG(a,b,c,d) ( ((long)(a)<<24) | ((long)(b)<<16) | ((c)<<8) | (d) ) #define BYTE1(x) (((x)>>24) & 0xff) #define BYTE2(x) (((x)>>16) & 0xff) diff --git a/source/texk/ptexenc/unicode.c b/source/texk/ptexenc/unicode.c index 4a2bfe245..0a4b3b30a 100644 --- a/source/texk/ptexenc/unicode.c +++ b/source/texk/ptexenc/unicode.c @@ -129,6 +129,214 @@ long UCStoUPTEX (long ucs) /* using over U+10.FFFF Area */ long UPTEXtoUCS (long uptex) { - if (uptex>=UCS_MAX) return uptex % UCS_MAX; /* for OTF package */ + long vs[2]; + if ((uptex>=0x220000 && uptex<=0x2FFFFF) || /* for 2-codepoint sequence */ + uptex>=0x400000) { /* for SVS, IVS */ + if (UVS_divide_code(uptex, vs) == 0) return 0; + return uptex; + } + if (uptex>=UCS_MAX*2) return uptex; + if (uptex>=UCS_MAX) return uptex % UCS_MAX; /* for OTF package */ return uptex; } + +int +UVS_get_codepoint_length(long ucv) +{ + int len = 0; + + if (ucv < 0x220000) { + len = 1; + } + else if (ucv >= 0x25E6E6 && ucv <= 0x25FFFF) { /* RGI Emoji Flag Sequence */ + if ((ucv & 0xFF) < 0xE6) return 0; /* illegal value */ + len = 2; + } + else if (ucv >= 0x800000 && ucv <= 0x80007F) { /* Emoji Keycap Sequence */ + ucv &= 0x7F; + if ( ucv==0x23 || ucv==0x2A || + (ucv>=0x30 && ucv<=0x39) ) len = 3; + else return 0; /* illegal value */ + } + else if (ucv < 0x300000) { + len = 2; + } + else if (ucv >= 0x400000 && ucv <= 0x43FFFFF) { + len = 2; + } + + return len; +} + +long +UVS_get_codepoint_in_sequence(long ucv, int n) +{ + long uvs, cp[3], len; + + cp[1] = cp[2] = 0; + + if (ucv < 0x220000) { + cp[0] = ucv % 0x110000; + len = 1; + } + else if (ucv >= 0x25E6E6 && ucv <= 0x25FFFF) { /* RGI Emoji Flag Sequence */ + if ((ucv & 0xFF) < 0xE6) return 0; /* illegal value */ + cp[0] = ((ucv >> 8) & 0xFF) + 0x1F100; + cp[1] = (ucv & 0xFF) + 0x1F100; + len = 2; + } + else if (ucv >= 0x800000 && ucv <= 0x80007F) { /* Emoji Keycap Sequence */ + cp[0] = ucv & 0x7F; + cp[1] = 0xFE0F; + cp[2] = 0x20E3; + len = 3; + } + else if (ucv < 0x300000) { + len = 2; + uvs = ucv >> 16; + if (uvs >= 0x22 && uvs <= 0x25) { /* (Semi-)Voiced Sound Mark */ + cp[0] = ucv & 0x1FFFF; + cp[1] = ((uvs - 0x22) >> 1) + 0x3099; + } + if (uvs >= 0x26 && uvs <= 0x2F) { /* Emoji Modifier Fitzpatrick */ + cp[0] = ucv & 0x1FFFF; + cp[1] = ((uvs - 0x26) >> 1) + 0x1F3FB; + } + } + else if (ucv >= 0x400000) { + len = 2; + uvs = ucv >> 16; + if (uvs >= 0x40 && uvs <= 0x7F) { /* SVS, VS1 .. VS16 */ + cp[0] = ucv & 0x3FFFF; + cp[1] = ((uvs - 0x40) >> 2) + 0xFE00; + } + if (uvs >= 0x80 && uvs <= 0x43F) { /* IVS, VS17 .. VS256 */ + cp[0] = ucv & 0x3FFFF; + cp[1] = ((uvs - 0x80) >> 2) + 0xE0100; + } + } + + if (n<0) + return len; + if (n>=1 && n<=3) { + return cp[n-1]; + } + + /* Unsupported */ + return 0; +} + +long +UVS_combine_code(long ucv, long uvs) +{ + if ( uvs == 0x20E3 && + ( ucv == 0x7C0023 || ucv == 0x7C002A || /* U+00xx U+FE0F U+20E3 */ + (ucv >= 0x7C0030 && ucv <= 0x7C0039))) { /* Emoji Keycap Sequence */ + return 0x40000 + ucv; + } + + if (ucv > 0x3FFFF) + return 0; + + if (((ucv >= 0x03000 && ucv <= 0x031FF) || + (ucv >= 0x1AFF0 && ucv <= 0x1B16F)) && + uvs >= 0x3099 && uvs <= 0x309A) { /* Kana (Semi-)Voiced Sound Mark */ + return ((uvs - 0x3099) << 17) + 0x220000 + ucv; + } + if (((ucv >= 0x02600 && ucv <= 0x027BF) || + (ucv >= 0x1F300 && ucv <= 0x1F9FF)) && + uvs >= 0x1F3FB && uvs <= 0x1F3FF) { /* Emoji Modifier Fitzpatrick */ + return ((uvs - 0x1F3FB) << 17) + 0x260000 + ucv; + } + if ( (ucv >=0x1F1E6 && ucv <= 0x1F1FF) && + (uvs >=0x1F1E6 && uvs <= 0x1F1FF) ) { /* RGI Emoji Flag Sequence */ + return ((ucv & 0xFF) << 8) + (uvs & 0xFF) + 0x250000; + } + if (ucv <= 0x2FFFF && uvs >= 0xFE00 && uvs <= 0xFE0F) { /* SVS, VS1 .. VS16 */ + return ((uvs - 0xFE00) << 18) + 0x400000 + ucv; + } + if (uvs >= 0xE0100) { /* IVS */ + if ( ucv <= 0x033FF || + (ucv >= 0x04DC0 && ucv <= 0x04DFF) || + (ucv >= 0x0A000 && ucv <= 0x0F8FF) || + (ucv >= 0x0FB00 && ucv <= 0x1FFFF) ) return 0; + if (ucv <= 0x0FFFF && uvs <=0xE01EF) { /* BMP, VS17 .. VS256 */ + return ((uvs - 0xE0100) << 18) + 0x800000 + ucv; + } + if (ucv <= 0x2FFFF && uvs <=0xE010F) { /* SIP, VS17 .. VS32 */ + return ((uvs - 0xE0100) << 18) + 0x800000 + ucv; + } + if ( uvs <=0xE010F) { /* TIP, VS17 .. VS32 */ + return ((uvs - 0xE0100) << 18) + 0x800000 + ucv; + } + } + /* Unsupported Combination */ + return 0; +} + +long +UVS_divide_code(long code, long* uvs) +{ + long u, v, p; + + u = code & 0x1FFFF; /* upto U+1FFFF */ + v = code >> 16; + /* for Combining Katakana-Hiragana (Semi-)Voiced Sound Mark */ + if (((u>=0x03000 && u<=0x031FF) || + (u>=0x1AFF0 && u<=0x1B16F)) && + v>=0x22 && v<=0x25) { + p = (v - 0x22) >> 1; /* Voiced or Semi-Voiced */ + if (uvs) *uvs = 0x3099 + p; + return u; + } + /* for Emoji Modifier Fitzpatrick */ + if (((u>=0x02600 && u<=0x027BF) || + (u>=0x1F300 && u<=0x1F9FF)) && + v>=0x26 && v<=0x2F) { + p = (v - 0x26) >> 1; /* Emoji Modifier Fitzpatrick Type-1..6 */ + if (uvs) *uvs = 0x1F3FB + p; + return u; + } + /* for RGI Emoji Flag Sequence */ + if ( u>=0x1E6E6 && v==0x25 ) { + if ((u & 0xFF) < 0xE6) goto Undefined; /* illegal value */ + u = ((u >> 8) & 0xFF) + 0x1F100; + v = ( u & 0xFF) + 0x1F100; /* Regional Indicator Symbol Letter */ + if (!uvs) goto Undefined; + *uvs = v; + return u; + } + + if (code<0x400000 || code>=0x4400000) { + /* Undefined */ + goto Undefined; + } + + /* for Variation Selector */ + u = code & 0x3FFFF; /* upto U+3FFFF */ + v = code >> 18; + p = u >> 16; + if (v < 0x20) { /* SVS VS1 .. VS16 */ + if (p==3) goto Undefined; + if (uvs) *uvs = v - 0x10 + 0xFE00; + return u; + } else + if (v == 0x20 && u <= 0x7F ) { /* for Emoji Keycap Sequence, need space for U+20E3 */ + if (uvs) { *uvs = 0xFE0F; *(uvs+1) = 0x20E3; } + return u; + } else /* IVS */ + if (v < 0x40) { /* VS17 .. VS32 */ + if (p==1) goto Undefined; + if (uvs) *uvs = v - 0x20 + 0xE0100; + return u; + } else if (v <= 0x1FF) { /* VS33 .. VS256 */ + if (p>0) goto Undefined; + if (uvs) *uvs = v - 0x20 + 0xE0100; + return u; + } + + Undefined: + /* Undefined */ + if (uvs) *uvs = 0; + return 0; +} diff --git a/source/texk/ptexenc/version.ac b/source/texk/ptexenc/version.ac index 03ac4d90b..76531c8ba 100644 --- a/source/texk/ptexenc/version.ac +++ b/source/texk/ptexenc/version.ac @@ -11,4 +11,4 @@ dnl Keep package and shared library versions the same; dnl see kpathsea/version.ac. dnl dnl This file is m4-included from configure.ac. -m4_define([ptexenc_version], [1.4.6/dev]) +m4_define([ptexenc_version], [1.5.0/dev]) From 465d381ff0448c058a36ccdaa127b0c9e6b93b5b Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Apr 2024 10:52:08 +0000 Subject: [PATCH 02/20] upTeX 1.35: Support combining characters git-svn-id: svn://tug.org/texlive/trunk/Build@71092 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/Makefile.in | 31 +- source/texk/web2c/euptexdir/COPYRIGHT | 4 +- source/texk/web2c/euptexdir/ChangeLog | 8 + source/texk/web2c/euptexdir/eptex.ech | 7 +- source/texk/web2c/euptexdir/euptex.defines | 5 + source/texk/web2c/euptexdir/pdfutils.ch | 31 +- source/texk/web2c/uptexdir/COPYRIGHT | 2 +- source/texk/web2c/uptexdir/ChangeLog | 17 + source/texk/web2c/uptexdir/am/uptex.am | 11 +- source/texk/web2c/uptexdir/kanji.c | 94 ++- source/texk/web2c/uptexdir/kanji.h | 7 + source/texk/web2c/uptexdir/newjfm.test | 17 +- source/texk/web2c/uptexdir/tests/kcat.tex | 15 + source/texk/web2c/uptexdir/tests/testnewu.pl | 12 +- source/texk/web2c/uptexdir/tests/testnewu.tfm | Bin 388 -> 424 bytes source/texk/web2c/uptexdir/tests/testnewu8.pl | 130 ++++ .../texk/web2c/uptexdir/tests/testnewu8.tfm | Bin 0 -> 424 bytes source/texk/web2c/uptexdir/tests/upkcat.txt | 12 + source/texk/web2c/uptexdir/tests/uptex5.dvi | Bin 0 -> 1356 bytes source/texk/web2c/uptexdir/tests/uptex5.tex | 42 ++ source/texk/web2c/uptexdir/tests/uptex5a.typ | 581 ++++++++++++++++++ source/texk/web2c/uptexdir/upbibtex.ch | 2 +- source/texk/web2c/uptexdir/updvitype.ch | 34 +- source/texk/web2c/uptexdir/updvitype.test | 2 +- source/texk/web2c/uptexdir/uppltotf.ch | 24 +- source/texk/web2c/uptexdir/uptex-m.ch | 308 +++++++--- source/texk/web2c/uptexdir/uptex.defines | 6 + source/texk/web2c/uptexdir/uptex_version.h | 2 +- source/texk/web2c/uptexdir/uptftopl.ch | 37 +- 29 files changed, 1274 insertions(+), 167 deletions(-) create mode 100644 source/texk/web2c/uptexdir/tests/testnewu8.pl create mode 100644 source/texk/web2c/uptexdir/tests/testnewu8.tfm create mode 100644 source/texk/web2c/uptexdir/tests/uptex5.dvi create mode 100644 source/texk/web2c/uptexdir/tests/uptex5.tex create mode 100644 source/texk/web2c/uptexdir/tests/uptex5a.typ diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 3db189aaa..1e42d352a 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -3224,18 +3224,21 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ $(upweb_tests) tests/enc-u.bbl tests/enc-eu.bbl \ tests/enc-su.bbl tests/enc-uu.bbl uptexdir/tests/uptex3.tex \ uptexdir/tests/uptex3.dvi uptexdir/tests/uptex4.tex \ - uptexdir/tests/uptex4.dvi uptexdir/tests/uptex3a.typ \ - uptexdir/tests/uptex4a.typ uptexdir/tests/umin10.pl \ - uptexdir/tests/umin10.tfm uptexdir/tests/utmin10.pl \ - uptexdir/tests/utmin10.tfm uptexdir/tests/testnewu.pl \ - uptexdir/tests/testnewu.tfm uptexdir/tests/uparse.pl \ - uptexdir/tests/uparse.tfm uptexdir/tests/gkhugeok.tfm \ - uptexdir/tests/gkhugeng.tfm uptexdir/tests/gkhugeng.err \ - uptexdir/tests/gk256g.tfm uptexdir/tests/gk256k.tfm \ - uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \ - $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \ - euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \ - euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \ + uptexdir/tests/uptex4.dvi uptexdir/tests/uptex5.tex \ + uptexdir/tests/uptex5.dvi uptexdir/tests/uptex3a.typ \ + uptexdir/tests/uptex4a.typ uptexdir/tests/uptex5a.typ \ + uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm \ + uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm \ + uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \ + uptexdir/tests/testnewu8.pl uptexdir/tests/testnewu8.tfm \ + uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \ + uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \ + uptexdir/tests/gkhugeng.err uptexdir/tests/gk256g.tfm \ + uptexdir/tests/gk256k.tfm uptexdir/uptrip/uptrip.diffs \ + uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \ + euptexdir/euptex.defines euptexdir/COPYRIGHT \ + euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \ + euptexdir/EUPTEX.txt $(euptex_tests) \ euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \ euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \ euptexdir/pdfprimitive.test \ @@ -3557,9 +3560,9 @@ DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \ uptests/nissya_bib.* uptests/xexampl.aux uptests/xexampl.bbl \ uptests/xexampl.blg uptests/xenc*.* uptests/fn*.* \ uptests/memtest.bib uptests/memtest?.* uptests/xstory.dvityp \ - uptests/xpagenum.typ uptests/x*ptex[34]*.typ \ + uptests/xpagenum.typ uptests/x*ptex[345]*.typ \ uptests/xcmr10.tfm uptests/xcmr10.pl uptests/xsample*.typ \ - uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu.* \ + uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu*.* \ uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \ uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs \ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \ diff --git a/source/texk/web2c/euptexdir/COPYRIGHT b/source/texk/web2c/euptexdir/COPYRIGHT index 3dfc192a1..88d900edb 100644 --- a/source/texk/web2c/euptexdir/COPYRIGHT +++ b/source/texk/web2c/euptexdir/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2007-2023 Takuji Tanaka -Copyright (C) 2010-2023 Japanese TeX Development Community +Copyright (C) 2007-2024 Takuji Tanaka +Copyright (C) 2010-2024 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/source/texk/web2c/euptexdir/ChangeLog b/source/texk/web2c/euptexdir/ChangeLog index 27ee3ab5b..136715e33 100644 --- a/source/texk/web2c/euptexdir/ChangeLog +++ b/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,11 @@ +2024-04-27 TANAKA Takuji + + * eptex.ech, pdfutils.ch, euptex.defines: + Support new encoding of upTeX for combining characters + with multiple codepoints. + https://github.com/texjporg/tex-jp-build/issues/46 + * COPYRIGHT: copyright year. + 2024-04-24 TANAKA Takuji * eptex.ech, etex.ch1, euptex.ch{0,1}, diff --git a/source/texk/web2c/euptexdir/eptex.ech b/source/texk/web2c/euptexdir/eptex.ech index cf6878cb1..a33ecad2b 100644 --- a/source/texk/web2c/euptexdir/eptex.ech +++ b/source/texk/web2c/euptexdir/eptex.ech @@ -719,10 +719,11 @@ if j=1 then begin cur_chr:=fromBUFF(ustringcast(buffer), limit+1, loc); cur_tok:=kcat_code(kcatcodekey(cur_chr)); if (multistrlen(ustringcast(buffer), limit+1,loc)>1)and - check_kcat_code(cur_tok) then + check_kcat_code(cur_tok,cur_chr) then begin if (cur_tok=not_cjk) then cur_tok:=other_kchar; - cur_tok:=cur_chr+cur_tok*max_cjk_val; - loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc); + if (cur_tok=latin_ucs) then cur_tok:=other_token; + cur_tok:=cur_chr+cur_tok*max_cjk_val; + loc:=loc+multistrlen(ustringcast(buffer), limit+1,loc); end else begin cur_chr:=buffer[loc]; incr(loc); if cur_chr=" " then cur_tok:=space_token diff --git a/source/texk/web2c/euptexdir/euptex.defines b/source/texk/web2c/euptexdir/euptex.defines index 20cee2a50..61e48d123 100644 --- a/source/texk/web2c/euptexdir/euptex.defines +++ b/source/texk/web2c/euptexdir/euptex.defines @@ -29,6 +29,9 @@ @define function fputs2 (); @define function inputline2 (); @define function ptencconvfirstline (); +@define function UVScombinecode (); +@define function UVSgetcodepointlength (); +@define function UVSgetcodepointinsequence (); @define function setinfileenc (); @define function setstdinenc (); @@ -48,6 +51,8 @@ @define function ischarkanji (); @define function ismultiprn (); @define function calcpos (); +@define function ktokentocmd (); +@define function ktokentochr (); @define function kcatcodekey (); @define function multilenbuffchar (); @define function nrestmultichr (); diff --git a/source/texk/web2c/euptexdir/pdfutils.ch b/source/texk/web2c/euptexdir/pdfutils.ch index 7324dd29b..1f39749cd 100644 --- a/source/texk/web2c/euptexdir/pdfutils.ch +++ b/source/texk/web2c/euptexdir/pdfutils.ch @@ -882,7 +882,7 @@ function str_toks_cat(@!b:pool_pointer;@!cat:small_number):pointer; @x if (cc=not_cjk) then cc:=other_kchar; @y - if cat>=kanji then cc:=cat else if (cc=not_cjk) then cc:=other_kchar; + if (cat>=kanji)and(cat<=modifier) then cc:=cat else if (cc=not_cjk) then cc:=other_kchar; @z @x \Ucharcat: str_toks_cat @@ -890,7 +890,7 @@ function str_toks_cat(@!b:pool_pointer;@!cat:small_number):pointer; else t:=other_token+t; @y if (t=" ")and(cat=0) then t:=space_token - else if (cat=0)or(cat>=kanji) then t:=other_token+t + else if (cat=0)or((cat>=kanji)and(cat<=modifier)) then t:=other_token+t else if cat=active_char then t:= cs_token_flag + active_base + t else t:=left_brace_token*cat+t; @z @@ -968,7 +968,7 @@ we have to create a temporary string that is destroyed immediately after. @ Not all catcode values are allowed by \.{\\Ucharcat}: @d illegal_Ucharcat_ascii_catcode(#)==(#active_char)or(#=out_param)or(#=ignore) -@d illegal_Ucharcat_wchar_catcode(#)==(#hangul) +@d illegal_Ucharcat_wchar_catcode(#)==(#modifier) @p procedure conv_toks; @z @@ -1156,7 +1156,7 @@ uniform_deviate_code: scan_int; normal_deviate_code: do_nothing; Uchar_convert_code: begin scan_char_num; if not is_char_ascii(cur_val) then - if kcat_code(kcatcodekey(cur_val))=not_cjk then cat:=other_kchar; + if kcat_code(kcatcodekey(cur_val))=not_cjk then cat:=other_kchar; end; Ucharcat_convert_code: begin @@ -1188,7 +1188,7 @@ Ucharcat_convert_code: help1("I'm going to use 18 instead of that illegal code value.");@/ error; cat:=other_kchar; end else cat:=cur_val; - end; + end; cur_val:=i; end; @z @@ -1882,27 +1882,6 @@ if_in_csname_code: b := is_in_csname; if_font_char_code:begin scan_font_ident; n:=cur_val; @z -@x -procedure print_kanji(@!s:KANJI_code); {prints a single character} -begin -s:=toBUFF(s mod max_cjk_val); -if BYTE1(s)<>0 then print_char(@"100+BYTE1(s)); -if BYTE2(s)<>0 then print_char(@"100+BYTE2(s)); -if BYTE3(s)<>0 then print_char(@"100+BYTE3(s)); - print_char(@"100+BYTE4(s)); -end; -@y -procedure print_kanji(@!s:KANJI_code); {prints a single character} -begin -if isprint_utf8 then s:=UCStoUTF8(toUCS(s mod max_cjk_val)) -else s:=toBUFF(s mod max_cjk_val); -if BYTE1(s)<>0 then print_char(@"100+BYTE1(s)); -if BYTE2(s)<>0 then print_char(@"100+BYTE2(s)); -if BYTE3(s)<>0 then print_char(@"100+BYTE3(s)); - print_char(@"100+BYTE4(s)); -end; -@z - @x @* \[54] System-dependent changes. @y diff --git a/source/texk/web2c/uptexdir/COPYRIGHT b/source/texk/web2c/uptexdir/COPYRIGHT index 69ce22345..0e73780c5 100644 --- a/source/texk/web2c/uptexdir/COPYRIGHT +++ b/source/texk/web2c/uptexdir/COPYRIGHT @@ -1,5 +1,5 @@ Copyright (C) 2009 ASCII MEDIA WORKS. -Copyright (C) 2007-2023 Takuji Tanaka +Copyright (C) 2007-2024 Takuji Tanaka All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index 7f40079d6..5ca5f7b8b 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,20 @@ +2024-04-27 TANAKA Takuji + + * uptex-m.ch, kanji.{c,h}, updvitype.ch, uptex.defines: + Support new encoding of upTeX for combining characters + with multiple codepoints. + Trial of Unicode Latin characters (experimental). + New kcatcodes (latin_ucs(14), modifier(20)) are added. + * {uppltotf,uptftopl,updvitype}.ch: Version p240427. + Support upTeX new encoding for combining characters. + * newjfm.test, updvitype.test, tests/kcat.tex, tests/upkcat.txt, + tests/uptex5.{tex,dvi}, tests/uptex5a.typ, + tests/testnewu{,8}.{pl,tfm}, am/uptex.am: Update tests. + * uptex-m.ch, upbibtex.ch, uptex_version.h: + upTeX version u1.35. + https://github.com/texjporg/tex-jp-build/issues/46 + * COPYRIGHT: copyright year. + 2024-04-14 TANAKA Takuji * {,u}ptriptest.test: diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am index 4df5f0850..1a4ee00d4 100644 --- a/source/texk/web2c/uptexdir/am/uptex.am +++ b/source/texk/web2c/uptexdir/am/uptex.am @@ -232,8 +232,10 @@ DISTCLEANFILES += uptests/memtest.bib uptests/memtest?.* ## uptexdir/updvitype.test EXTRA_DIST += uptexdir/tests/uptex3.tex uptexdir/tests/uptex3.dvi \ uptexdir/tests/uptex4.tex uptexdir/tests/uptex4.dvi \ - uptexdir/tests/uptex3a.typ uptexdir/tests/uptex4a.typ -DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ uptests/x*ptex[34]*.typ + uptexdir/tests/uptex5.tex uptexdir/tests/uptex5.dvi \ + uptexdir/tests/uptex3a.typ uptexdir/tests/uptex4a.typ \ + uptexdir/tests/uptex5a.typ +DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ uptests/x*ptex[345]*.typ ## uptexdir/uppltotf.test DISTCLEANFILES += uptests/xcmr10.tfm ## uptexdir/uptftopl.test @@ -245,8 +247,9 @@ EXTRA_DIST += uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm EXTRA_DIST += uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm DISTCLEANFILES += uptests/x*min10.* uptests/xchcode*.* ## uptexdir/newjfm.test -EXTRA_DIST += uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm -DISTCLEANFILES += uptests/xtestnewu.* +EXTRA_DIST += uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \ + uptexdir/tests/testnewu8.pl uptexdir/tests/testnewu8.tfm +DISTCLEANFILES += uptests/xtestnewu*.* ## uptexdir/uparse.test EXTRA_DIST += uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm DISTCLEANFILES += uptests/xuparse.* uptests/yuparse.* diff --git a/source/texk/web2c/uptexdir/kanji.c b/source/texk/web2c/uptexdir/kanji.c index 66bd87044..ddeca5a53 100644 --- a/source/texk/web2c/uptexdir/kanji.c +++ b/source/texk/web2c/uptexdir/kanji.c @@ -6,17 +6,36 @@ #include "kanji.h" #define CS_TOKEN_FLAG 0x1FFFFFFF +#define IVS_CHAR_LIMIT 0x4400000 #define CJK_CHAR_LIMIT 0x1000000 +#define UCS_CHAR_LIMIT 0x120000 #define CJK_TOKEN_FLAG 0xFFFFFF +#define CAT_LEFT_BRACE 1 +#define CAT_DELIM_NUM 15 #define KCAT_KANJI 16 -#define KCAT_HANGUL 19 +#define KCAT_MODIFIER 20 +#define KCAT_KANJI_IVS 23 /* TOKEN */ boolean check_kanji (integer c) { + integer c0, c1; + if (c >= CS_TOKEN_FLAG) return false; - else if (!(XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL)) return false; - else return is_char_kanji(c & CJK_TOKEN_FLAG); + + c0 = c & CJK_TOKEN_FLAG; + c1 = XXHi(c); + if (c1>=CAT_LEFT_BRACE && c1<=CAT_DELIM_NUM && + c0 < UCS_CHAR_LIMIT) { + return is_char_kanji(c0); + } + else if (c1>=KCAT_KANJI && c1<=KCAT_MODIFIER) { + return is_char_kanji(c0); + } + else if (c1>=KCAT_KANJI_IVS+1 && c1<=KCAT_KANJI_IVS+4) { + return is_char_kanji(c - KCAT_KANJI_IVS * CJK_CHAR_LIMIT); + } + return false; } boolean is_char_ascii(integer c) @@ -27,7 +46,7 @@ boolean is_char_ascii(integer c) boolean is_char_kanji(integer c) { if (is_internalUPTEX()) - return ((c >= 0)&&(c= 0)&&(c KCAT_KANJI_IVS * CJK_CHAR_LIMIT) + return KCAT_KANJI; + else + return (c / CJK_CHAR_LIMIT); +} + +integer ktoken_to_chr(integer c) +{ + if (c > KCAT_KANJI_IVS * CJK_CHAR_LIMIT) + return (c - KCAT_KANJI_IVS * CJK_CHAR_LIMIT); + else + return (c % CJK_CHAR_LIMIT); +} + /* Ref. http://www.unicode.org/Public/UNIDATA/Blocks.txt */ /* # Blocks-15.1.0.txt */ /* # Date: 2023-07-28, 15:47:20 GMT */ @@ -396,6 +431,7 @@ static long ucs_range[]={ 0xD0000, /* reserved */ 0xE0000, /* Tags */ 0xE0100, /* Variation Selectors Supplement */ /* 0x150 */ + 0xE01F0, /* reserved */ 0xF0000, /* Supplementary Private Use Area-A */ 0x100000, /* Supplementary Private Use Area-B */ /* Value over 0x10FFFF is illegal under Unicode, @@ -412,13 +448,21 @@ static long ucs_range[]={ 0x1A0000, /* Reserved */ 0x1B0000, /* Reserved */ 0x1C0000, /* Reserved */ - 0x1D0000, /* Reserved */ - 0x1E0000, /* Reserved */ /* 0x160 */ + 0x1D0000, /* Reserved */ /* 0x160 */ + 0x1E0000, /* Reserved */ 0x1F0000, /* Reserved */ 0x200000, /* Reserved */ 0x210000, /* Reserved */ - 0x220000, /* Reserved */ /* 0x164 */ - CJK_CHAR_LIMIT + 0x220000, /* Kana with Voiced Sound Mark */ + 0x240000, /* Kana with Semi-Voiced Sound Mark */ + 0x25E6E6, /* Emoji Flag Sequence */ + 0x260000, /* Emoji with Modifier Fitzpatrick */ + 0x300000, /* Reserved */ + 0x400000, /* Standardized Variation Sequence */ + 0x800000, /* Emoji Keycap Sequence */ + 0x800080, /* Ideographic Variation Sequence */ /* 0x16C */ + CJK_CHAR_LIMIT, /* Ideographic Variation Sequence, VS49..VS256 */ + IVS_CHAR_LIMIT }; #define NUCS_RANGE (sizeof(ucs_range)/sizeof(ucs_range[0])) @@ -447,6 +491,9 @@ binary_search (long x, long *a, int left, int right) #define LATIN_SMALL_LETTER_O_WITH_DIAERESIS 0x00F6 #define LATIN_SMALL_LETTER_O_WITH_STROKE 0x00F8 #define LATIN_SMALL_LETTER_Y_WITH_DIAERESIS 0x00FF +#define COMBINING_ENCLOSING_KEYCAP 0x20E3 +#define COMBINING_KANA_VOICED_SOUND_MARK 0x3099 +#define COMBINING_KANA_SEMI_VOICED_SOUND_MARK 0x309A #define FULLWIDTH_DIGIT_0 0xFF10 #define FULLWIDTH_DIGIT_9 0xFF19 #define FULLWIDTH_CAPITAL_A 0xFF21 @@ -457,13 +504,18 @@ binary_search (long x, long *a, int left, int right) #define HALFWIDTH_KATAKANA_SMALL_TSU 0xFF6F #define HALFWIDTH_KATAKANA_A 0xFF71 #define HALFWIDTH_KATAKANA_N 0xFF9D +#define REGIONAL_INDICATOR_SYMBOL_LETTER_A 0x1F1E6 +#define REGIONAL_INDICATOR_SYMBOL_LETTER_Z 0x1F1FF +#define EMOJI_MODIFIER_FITZPATRIC_TYPE1_2 0x1F3FB +#define EMOJI_MODIFIER_FITZPATRIC_TYPE6 0x1F3FF integer kcatcodekey(integer c) { integer block; if (is_internalUPTEX()) { block = binary_search((long)c, ucs_range, 0, NUCS_RANGE-1); - if (block==0x01) { /* Block : Latin-1 Supplement */ + switch (block) { + case 0x01: /* Block : Latin-1 Supplement */ /* Latin-1 Letters */ if ( FEMININE_ORDINAL_INDICATOR ==c || MASCULINE_ORDINAL_INDICATOR==c @@ -471,17 +523,35 @@ integer kcatcodekey(integer c) || (LATIN_CAPITAL_LETTER_O_WITH_STROKE<=c && c<=LATIN_SMALL_LETTER_O_WITH_DIAERESIS ) || (LATIN_SMALL_LETTER_O_WITH_STROKE <=c && c<=LATIN_SMALL_LETTER_Y_WITH_DIAERESIS ) ) return 0x1FD; - } - if (block==0xa2) { /* Block : Halfwidth and Fullwidth Forms */ + break; + case 0xa2: /* Block : Halfwidth and Fullwidth Forms */ /* Fullwidth ASCII variants except for U+FF01..FF0F, U+FF1A..FF20, U+FF3B..FF40, U+FF5B..FF5E */ if ( (FULLWIDTH_DIGIT_0 <=c && c<=FULLWIDTH_DIGIT_9 ) || (FULLWIDTH_CAPITAL_A<=c && c<=FULLWIDTH_CAPITAL_Z) || (FULLWIDTH_SMALL_A <=c && c<=FULLWIDTH_SMALL_Z ) ) return 0x1FE; - /* Halfwidth Katakana variants except for U+FF65, U+FF70, U+FF9E..FF9F */ + /* Halfwidth Katakana variants except for U+FF65, U+FF70, U+FF9E..FF9F */ if ( (HALFWIDTH_KATAKANA_WO <=c && c<=HALFWIDTH_KATAKANA_SMALL_TSU ) || (HALFWIDTH_KATAKANA_A <=c && c<=HALFWIDTH_KATAKANA_N ) ) return 0x1FF; + break; + case 0x6c: /* Block : Hiragana */ + if ( COMBINING_KANA_VOICED_SOUND_MARK==c + || COMBINING_KANA_SEMI_VOICED_SOUND_MARK==c ) + return 0x1F9; + break; + case 0x4b: /* Block : Combining Diacritical Marks for Symbols */ + if ( COMBINING_ENCLOSING_KEYCAP==c ) + return 0x1FA; + break; + case 0x12e: /* Block : Enclosed Alphanumeric Supplement */ + if ( REGIONAL_INDICATOR_SYMBOL_LETTER_A <=c && c<= REGIONAL_INDICATOR_SYMBOL_LETTER_Z ) + return 0x1FB; + break; + case 0x130: /* Block : Miscellaneous Symbols and Pictographs */ + if ( EMOJI_MODIFIER_FITZPATRIC_TYPE1_2 <=c && c<= EMOJI_MODIFIER_FITZPATRIC_TYPE6 ) + return 0x1FC; + break; } return block; } else { diff --git a/source/texk/web2c/uptexdir/kanji.h b/source/texk/web2c/uptexdir/kanji.h index 6109288af..419990a99 100644 --- a/source/texk/web2c/uptexdir/kanji.h +++ b/source/texk/web2c/uptexdir/kanji.h @@ -35,6 +35,10 @@ extern boolean is_char_kanji (integer c); extern boolean ismultiprn (integer c); extern integer calc_pos (integer c); #define calcpos calc_pos +extern integer ktoken_to_cmd (integer c); +extern integer ktoken_to_chr (integer c); +#define ktokentocmd ktoken_to_cmd +#define ktokentochr ktoken_to_chr extern integer kcatcodekey (integer c); extern integer multilenbuffchar (integer c); @@ -67,6 +71,9 @@ extern void init_default_kanji_select (void); #define inputline2(fp,buff,pos,size) input_line2(fp,buff,NULL,pos,size,NULL) #endif #define ptencconvfirstline(pos,limit,buff,size) ptenc_conv_first_line(pos,limit,buff,size) +#define UVScombinecode(ucv,uvs) UVS_combine_code(ucv,uvs) +#define UVSgetcodepointlength(ucv) UVS_get_codepoint_length(ucv) +#define UVSgetcodepointinsequence(ucv,n) UVS_get_codepoint_in_sequence(ucv,n) extern void init_kanji (const_string file_str, const_string internal_str); extern void dump_kanji (gzFile fp); diff --git a/source/texk/web2c/uptexdir/newjfm.test b/source/texk/web2c/uptexdir/newjfm.test index 986bbdd0d..04b4cdb8a 100755 --- a/source/texk/web2c/uptexdir/newjfm.test +++ b/source/texk/web2c/uptexdir/newjfm.test @@ -1,5 +1,6 @@ #! /bin/sh -vx -# $Id: newjfm.test 46400 2018-01-21 05:26:27Z hironobu $ +# $Id$ +# Copyright 2024 Japanese TeX Development Community # Copyright 2018 Karl Berry # You may freely use, modify and/or distribute this file. @@ -25,3 +26,17 @@ for font in testnewu; do done +for font in testnewu8; do + + $_uppltotf -verbose $testdir/$font.pl uptests/x$font.tfm && \ + cmp $testdir/$font.tfm uptests/x$font.tfm && echo || exit 3 + + TEXMFCNF=$srcdir/../kpathsea \ + $_uptftopl -verbose $testdir/$font.tfm uptests/x$font.pl && \ + diff $testdir/$font.pl uptests/x$font.pl && echo || exit 4 + +done + +cmp uptests/xtestnewu.tfm uptests/xtestnewu8.tfm || exit 10 + +exit 0 diff --git a/source/texk/web2c/uptexdir/tests/kcat.tex b/source/texk/web2c/uptexdir/tests/kcat.tex index fd841d4b8..6a3f930c2 100644 --- a/source/texk/web2c/uptexdir/tests/kcat.tex +++ b/source/texk/web2c/uptexdir/tests/kcat.tex @@ -48,6 +48,8 @@ \write16{丽::\the\kcatcode"2F800}% U+2F800 CJK Compatibility Ideographs Supplement \write16{𰀀::\the\kcatcode"30000}% U+30000 CJK Unified Ideographs Extension G \write16{𱍐::\the\kcatcode"31350}% U+31350 CJK Unified Ideographs Extension H +\write16{逸︀::\the\kcatcode"409038}% U+9038 U+FE00 Standardized Variation Sequence +\write16{逸󠄀::\the\kcatcode"809038}% U+9038 U+E0100 Ideographic Variation Sequence % kana=17 {hiragana, katakana} \write16{あ::\the\kcatcode"3042}% U+3042 Hiragana @@ -57,6 +59,8 @@ \write16{𛀀::\the\kcatcode"1B000}% U+1B000 Kana Supplement \write16{𛄀::\the\kcatcode"1B100}% U+1B100 Kana Extended-A \write16{𛅐::\the\kcatcode"1B150}% U+1B150 Small Kana Extension +\write16{あ゙::\the\kcatcode"223042}% U+3042 U+3099 Kana with Voiced Sound Mark +\write16{か゚::\the\kcatcode"24304B}% U+304B U+309A Kana with Semi-Voiced Sound Mark % other_kchar=18 {cjk symbol codes} \write16{※::\the\kcatcode"203B}% U+203B General Punctuation @@ -71,6 +75,9 @@ \write16{〠::\the\kcatcode"3020}% U+3020 CJK Symbols and Punctuation \write16{㋐::\the\kcatcode"32D0}% U+32D0 Enclosed CJK Letters and Months \write16{㍿::\the\kcatcode"337F}% U+337F CJK Compatibility +\write16{🇯🇵::\the\kcatcode"25EFF5}% U+1F1EF U+1F1F5 Emoji Flag Sequence +\write16{👶🏽::\the\kcatcode"2BF476}% U+1F476 U+1F3FD Emoji with Modifier Fitzpatrick +\write16{0x800030::\the\kcatcode"800030}% U+0030 U+FE0F U+20E3 Emoji Keycap Sequence % hangul=19 {hangul codes} \write16{ᄀ::\the\kcatcode"1100}% U+1100 Hangul Jamo @@ -79,4 +86,12 @@ \write16{가::\the\kcatcode"AC00}% U+AC00 Hangul Syllables \write16{ힰ::\the\kcatcode"D7B0}% U+D7B0 Hangul Jamo Extended-B +% modifier=20 {modifier codes} +\write16{゚\the\kcatcode"309A}% U+309A Combining Kana (Semi-)Voiced Sound Mark +\write16{⃣::\the\kcatcode"20E3}% U+20E3 Combining Enclosing Keycap +\write16{🇦::\the\kcatcode"1F1E6}% U+1F1E6 Regional Indicator Symbol Letter +\write16{🏻::\the\kcatcode"1F3FB}% U+1F3FB Emoji Modifier Fitzpatrick +\write16{︀::\the\kcatcode"FE00}% U+FE00 Variation Selector +\write16{󠄀::\the\kcatcode"E0100}% U+E0100 Variation Selector + \relax\end diff --git a/source/texk/web2c/uptexdir/tests/testnewu.pl b/source/texk/web2c/uptexdir/tests/testnewu.pl index 6b211cd51..8d07246bf 100644 --- a/source/texk/web2c/uptexdir/tests/testnewu.pl +++ b/source/texk/web2c/uptexdir/tests/testnewu.pl @@ -52,10 +52,10 @@ (STOP) ) (CHARSINTYPE O 1 - U 81FC U FF08 U 26951 + U 81FC U FF08 U 26951 U 23B0A6 U 24304B U 25B0B1 ) (CHARSINTYPE O 2 - U 5409 U FF09 U 20BB7 + U 5409 U FF09 U 20BB7 U 25EFF5 ) (CHARSINTYPE O 3 U 2462 U FF1A @@ -64,7 +64,7 @@ U 2463 U 3002 ) (CHARSINTYPE O 5 - U 2026 U 2464 + U 2026 U 2464 U 26270B U 2FF476 ) (TYPE O 0 (CHARWD R 1.0) @@ -76,7 +76,7 @@ ) ) (TYPE O 1 - (CHARWD R 0.5) + (CHARWD R 1.01) (CHARHT R 0.88) (CHARDP R 0.12) (COMMENT @@ -84,7 +84,7 @@ ) ) (TYPE O 2 - (CHARWD R 0.5) + (CHARWD R 1.02) (CHARHT R 0.88) (CHARDP R 0.12) (COMMENT @@ -119,7 +119,7 @@ ) ) (TYPE O 5 - (CHARWD R 1.0) + (CHARWD R 1.05) (CHARHT R 0.88) (CHARDP R 0.12) (COMMENT diff --git a/source/texk/web2c/uptexdir/tests/testnewu.tfm b/source/texk/web2c/uptexdir/tests/testnewu.tfm index 6860278f2ca141ed2e3e7f1431786e80848e286e..5492e2c3c1b88115ae844cc1606826c331323948 100644 GIT binary patch delta 98 zcmZo+Uct=Az|A1cki{Uxz`(%Dz&4Su%VWbbWkv&U6~+x4RT-i#0KyvI7z6^}FbJGEJ8{nm08FwG^#A|> delta 62 zcmZ3%+``Pqz|FwRkjNm!z`(%Dz&w$!ONB|0k%3W=kqL;IftVeLd4XbrKotxO96&6< Jz%cQ_2>`W-1`q%M diff --git a/source/texk/web2c/uptexdir/tests/testnewu8.pl b/source/texk/web2c/uptexdir/tests/testnewu8.pl new file mode 100644 index 000000000..cca18cfaf --- /dev/null +++ b/source/texk/web2c/uptexdir/tests/testnewu8.pl @@ -0,0 +1,130 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(FAMILY UPJIS KANJI) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 0) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.1) + (SHRINK R 0.0) + (XHEIGHT R 1.0) + (QUAD R 1.0) + (EXTRASPACE R 0.25) + (EXTRASTRETCH R 0.2) + (EXTRASHRINK R 0.125) + ) +(GLUEKERN + (LABEL O 0) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 1) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 2) + (GLUE O 0 R 0.5 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.5) + (STOP) + (LABEL O 3) + (GLUE O 0 R 0.25 R 0.0 R 0.25) + (GLUE O 1 R 0.25 R 0.0 R 0.25) + (GLUE O 2 R 0.25 R 0.0 R 0.25) + (GLUE O 3 R 0.5 R 0.0 R 0.25) + (GLUE O 4 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.25 R 0.0 R 0.25) + (STOP) + (LABEL O 4) + (GLUE O 0 R 0.5 R 0.0 R 0.0) + (GLUE O 1 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 0.75 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.0) + (STOP) + (LABEL O 5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (KRN O 5 R 0.0) + (STOP) + ) +(CHARSINTYPE O 1 + 臼 （ 𦥑 𛂦゙ か゚ 𛂱゚ + ) +(CHARSINTYPE O 2 + 吉 ） 𠮷 🇯🇵 + ) +(CHARSINTYPE O 3 + ③ ： + ) +(CHARSINTYPE O 4 + ④ 。 + ) +(CHARSINTYPE O 5 + … ⑤ ✋🏻 👶🏿 + ) +(TYPE O 0 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + ) + ) +(TYPE O 1 + (CHARWD R 1.01) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 3 R 0.25 R 0.0 R 0.25) + ) + ) +(TYPE O 2 + (CHARWD R 1.02) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 0 R 0.5 R 0.0 R 0.5) + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.5) + ) + ) +(TYPE O 3 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 0 R 0.25 R 0.0 R 0.25) + (GLUE O 1 R 0.25 R 0.0 R 0.25) + (GLUE O 2 R 0.25 R 0.0 R 0.25) + (GLUE O 3 R 0.5 R 0.0 R 0.25) + (GLUE O 4 R 0.25 R 0.0 R 0.25) + (GLUE O 5 R 0.25 R 0.0 R 0.25) + ) + ) +(TYPE O 4 + (CHARWD R 0.5) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 0 R 0.5 R 0.0 R 0.0) + (GLUE O 1 R 0.5 R 0.0 R 0.0) + (GLUE O 3 R 0.75 R 0.0 R 0.25) + (GLUE O 5 R 0.5 R 0.0 R 0.0) + ) + ) +(TYPE O 5 + (CHARWD R 1.05) + (CHARHT R 0.88) + (CHARDP R 0.12) + (COMMENT + (GLUE O 1 R 0.5 R 0.0 R 0.5) + (GLUE O 3 R 0.25 R 0.0 R 0.25) + (KRN O 5 R 0.0) + ) + ) diff --git a/source/texk/web2c/uptexdir/tests/testnewu8.tfm b/source/texk/web2c/uptexdir/tests/testnewu8.tfm new file mode 100644 index 0000000000000000000000000000000000000000..5492e2c3c1b88115ae844cc1606826c331323948 GIT binary patch literal 424 zcmZutyG{c^3>jB#{siheQoD@BuV5N5MxxMMWJdeu8{S zkZ6DkDcHU{iGp2?Jsyv>4E_F;qzuca3r`$>?1jfv?^E+k)j>bl9(#?zL8Gfk-p7M?{sf1)8f9$Koj literal 0 HcmV?d00001 diff --git a/source/texk/web2c/uptexdir/tests/upkcat.txt b/source/texk/web2c/uptexdir/tests/upkcat.txt index a3b509a22..d4da0a6df 100644 --- a/source/texk/web2c/uptexdir/tests/upkcat.txt +++ b/source/texk/web2c/uptexdir/tests/upkcat.txt @@ -25,6 +25,8 @@ A::15 丽::16 𰀀::16 𱍐::16 +逸︀::16 +逸󠄀::16 あ::17 ア::17 ㇰ::17 @@ -32,6 +34,8 @@ A::15 𛀀::17 𛄀::17 𛅐::17 +あ゙::17 +か゚::17 ※::18 ℃::18 Ⅻ::18 @@ -44,8 +48,16 @@ A::15 〠::18 ㋐::18 ㍿::18 +🇯🇵::18 +👶🏽::18 +0x800030::18 ᄀ::19 ㄱ::19 ꥠ::19 가::19 ힰ::19 +⃣::20 +🇦::20 +🏻::20 +︀::20 +󠄀::20 diff --git a/source/texk/web2c/uptexdir/tests/uptex5.dvi b/source/texk/web2c/uptexdir/tests/uptex5.dvi new file mode 100644 index 0000000000000000000000000000000000000000..074c78dd37a601ace8b8277cf397b3552009fa7d GIT binary patch literal 1356 zcmey)#MnIPfQ&T*5HP=xRtQOrP{=PWDJU&bFfuSQ(K9g7Gcva_G&L~m2C85LDI)~_ z13~ZnPYeuw3z(XXZ}l$t+jd5+_p{y0`4_%1Z~=9LFk5MEW}czJ%f<;7)0nwFH5&Y$ z+~hF9VltTF0%J757%ebH#{`SMB|Hoaz2sDT7$131eu(7`iZq{+BXPh>@vH_19;(ZK|(+L2Off_5#Xy{}syk{|6@Z z3?}j)WG$uoYZ#Pa_BS$UHU8s=m|nwR0Am=!7)CG#G>z6USb|)DWCD<_1ye+{{swdx zG%7rX7}5Z9L<0lV5e*DbM>H@%9nk=B1d<_54KPQLp#P5_11uPt85#U~zz%3;WbxyK zu$UOaZbMki2mGc$S$_g^AuJXfKW0!+3>s7V=1Twzh)E1D5*B}E@cx)k2`_b6lXHs< s4OScW_51*qL0ZT~AJc5(TZ~r^x-&2_Fk&yOu$uLgfq~@*(|s@i0M|lNe*gdg literal 0 HcmV?d00001 diff --git a/source/texk/web2c/uptexdir/tests/uptex5.tex b/source/texk/web2c/uptexdir/tests/uptex5.tex new file mode 100644 index 000000000..f67ce5637 --- /dev/null +++ b/source/texk/web2c/uptexdir/tests/uptex5.tex @@ -0,0 +1,42 @@ +%#!uptex + +\parindent=0pt +\font\jpy=umin10 +\jpy +% IVS, SVS +逸・逸︀・逸︁・逸󠄀・逸󠄁・逸󠄂\par +\kchar"9038・\kchar"9038\kchar"FE00・\kchar"449038・\kchar"9038\kchar"E0100・\kchar"849038・\kchar"9038\kchar"E0102\par + +𤋮・𤋮︀・𤋮󠄀・𤋮󠄁\par +\kchar"242EE・\kchar"242EE\kchar"FE00・\kchar"242EE\kchar"E0100・\kchar"8642EE\par + +% Kana Voiced Sound +か・が・か゚・か゚・あ゙・𛂦゙\par +\kchar"304B・\kchar"304C・\kchar"304B\kchar"309A・\kchar"24304B・\kchar"223042・\kchar"23B0A6\par + +% Emoji Modifier Fitzpatrick +✋・✋🏻・✋🏼・✋🏽・✋🏾・✋🏿\par +\kchar"270B・\kchar"270B\kchar"1F3FB・\kchar"28270B・\kchar"270B\kchar"1F3FD・\kchar"2C270B・\kchar"270B\kchar"1F3FF\par + +👶・👶🏻・👶🏼・👶🏽・👶🏾・👶🏿\par +\kchar"1F476・\kchar"1F476\kchar"1F3FB・\kchar"29F476・\kchar"1F476\kchar"1F3FD・\kchar"2DF476・\kchar"1F476\kchar"1F3FF\par + +% Emoji Flag Sequence +🇺🇳・🇪🇺・🇦🇨・🇯🇵・🇿🇼・🇦🇦・🇿🇿\par +\kchar"1F1FA\kchar"1F1F3・\kchar"1F1EA\kchar"1F1FA・\kchar"1F1E6\kchar"1F1E8・\kchar"1F1EF\kchar"1F1F5・\kchar"1F1FF\kchar"1F1FC・\kchar"1F1E6\kchar"1F1E6・\kchar"1F1FF\kchar"1F1FF\par + +% Base for Emoji Keycap Sequence +\kchar"23\kchar"FE0F・\kchar"2A\kchar"FE0F・\kchar"30\kchar"FE0F・\kchar"31\kchar"FE0F・\kchar"32\kchar"FE0F・\kchar"38\kchar"FE0F・\kchar"39\kchar"FE0F\par +\kchar"7C0023・\kchar"7C002A・\kchar"7C0030・\kchar"7C0031・\kchar"7C0032・\kchar"7C0038・\kchar"7C0039\par + +% Emoji Keycap Sequence +\kchar"23\kchar"FE0F\kchar"20E3・\kchar"2A\kchar"FE0F\kchar"20E3・\kchar"30\kchar"FE0F\kchar"20E3・\kchar"31\kchar"FE0F\kchar"20E3・\kchar"32\kchar"FE0F\kchar"20E3・\kchar"38\kchar"FE0F\kchar"20E3・\kchar"39\kchar"FE0F\kchar"20E3\par +\kchar"7C0023\kchar"20E3・\kchar"80002A・\kchar"7C0030\kchar"20E3・\kchar"800031・\kchar"7C0032\kchar"20E3・\kchar"800038・\kchar"800039\par + +% IVS, over VS48 +一󠄟・二󠄠・三󠄡・四󠅠・五󠇐・六󠇟・七󠇯\par +\kchar"4E00\kchar"E011F・\kchar"4E8C\kchar"E0120・\kchar"4E09\kchar"E0121・\kchar"56DB\kchar"E0160 +・\kchar"4E94\kchar"E01D0・\kchar"516D\kchar"E01DF・\kchar"4E03\kchar"E01EF\par +\kchar"FC4E00・\kchar"1004E8C・\kchar"1044E09・\kchar"20056DB +・\kchar"3C04E94・\kchar"3FC516D・\kchar"43C4E03\par +\bye diff --git a/source/texk/web2c/uptexdir/tests/uptex5a.typ b/source/texk/web2c/uptexdir/tests/uptex5a.typ new file mode 100644 index 000000000..9568cc94d --- /dev/null +++ b/source/texk/web2c/uptexdir/tests/uptex5a.typ @@ -0,0 +1,581 @@ +Options selected: + Starting page = * + Maximum number of pages = 1000000 + Output level = 4 (the works) + Resolution = 300.00000000 pixels per inch +numerator/denominator=25400000/473628672 +magnification=1000; 0.00006334 pixels per DVI unit +' TeX output 2024.04.27:1506' +Postamble starts at byte 1272. +maxv=43725786, maxh=30785863, maxstackdepth=2, totalpages=1 +Font 62: umin10 (JFM)---loaded at size 655360 DVI units +Font 0: cmr10---loaded at size 655360 DVI units + +42: beginning of page 1 +87: push +level 0:(h=0,v=0,w=0,x=0,y=0,z=0,hh=0,vv=0) +88: down3 -917504 v:=0-917504=-917504, vv:=-58 +92: pop +level 0:(h=0,v=0,w=0,x=0,y=0,z=0,hh=0,vv=0) +93: down4 42152922 v:=0+42152922=42152922, vv:=2670 +98: push +level 0:(h=0,v=42152922,w=0,x=0,y=0,z=0,hh=0,vv=2670) +99: down4 -41497562 v:=42152922-41497562=655360, vv:=42 +104: push +level 1:(h=0,v=655360,w=0,x=0,y=0,z=0,hh=0,vv=42) +105: fntdef1 62: umin10 +127: fntnum62 current font is umin10 +128: set2 36920("9038) type=0 h:=0+630598=630598, hh:=40 +131: w3 199410 h:=630598+199410=830008, hh:=53 +135: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +138: w0 199410 h:=1061786+199410=1261196, hh:=80 +139: set3 4231224("409038) type=0 h:=1261196+630598=1891794, hh:=120 +143: w0 199410 h:=1891794+199410=2091204, hh:=132 +144: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +147: w0 199410 h:=2322982+199410=2522392, hh:=160 +148: set3 4493368("449038) type=0 h:=2522392+630598=3152990, hh:=200 +152: w0 199410 h:=3152990+199410=3352400, hh:=212 +153: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +156: w0 199410 h:=3584178+199410=3783588, hh:=240 +157: set3 8425528("809038) type=0 h:=3783588+630598=4414186, hh:=280 +161: w0 199410 h:=4414186+199410=4613596, hh:=292 +162: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +165: w0 199410 h:=4845374+199410=5044784, hh:=320 +166: set3 8687672("849038) type=0 h:=5044784+630598=5675382, hh:=360 +170: w0 199410 h:=5675382+199410=5874792, hh:=372 +171: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +174: w0 199410 h:=6106570+199410=6305980, hh:=399 +175: set3 8949816("889038) type=0 h:=6305980+630598=6936578, hh:=439 +[逸 ・ 逸︀ ・ 逸︁ ・ 逸󠄀 ・ 逸󠄁 ・ 逸󠄂] +179: pop +level 1:(h=0,v=655360,w=0,x=0,y=0,z=0,hh=0,vv=42) +180: y3 786432 v:=655360+786432=1441792, vv:=91 +184: push +level 1:(h=0,v=1441792,w=0,x=0,y=786432,z=0,hh=0,vv=91) +185: set2 36920("9038) type=0 h:=0+630598=630598, hh:=40 +188: w3 199410 h:=630598+199410=830008, hh:=53 +192: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +195: w0 199410 h:=1061786+199410=1261196, hh:=80 +196: set3 4231224("409038) type=0 h:=1261196+630598=1891794, hh:=120 +200: w0 199410 h:=1891794+199410=2091204, hh:=132 +201: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +204: w0 199410 h:=2322982+199410=2522392, hh:=160 +205: set3 4493368("449038) type=0 h:=2522392+630598=3152990, hh:=200 +209: w0 199410 h:=3152990+199410=3352400, hh:=212 +210: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +213: w0 199410 h:=3584178+199410=3783588, hh:=240 +214: set3 8425528("809038) type=0 h:=3783588+630598=4414186, hh:=280 +218: w0 199410 h:=4414186+199410=4613596, hh:=292 +219: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +222: w0 199410 h:=4845374+199410=5044784, hh:=320 +223: set3 8687672("849038) type=0 h:=5044784+630598=5675382, hh:=360 +227: w0 199410 h:=5675382+199410=5874792, hh:=372 +228: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +231: w0 199410 h:=6106570+199410=6305980, hh:=399 +232: set3 8949816("889038) type=0 h:=6305980+630598=6936578, hh:=439 +[逸 ・ 逸︀ ・ 逸︁ ・ 逸󠄀 ・ 逸󠄁 ・ 逸󠄂] +236: pop +level 1:(h=0,v=1441792,w=0,x=0,y=786432,z=0,hh=0,vv=91) +237: y0 786432 v:=1441792+786432=2228224, vv:=141 +238: push +level 1:(h=0,v=2228224,w=0,x=0,y=786432,z=0,hh=0,vv=141) +239: set3 148206("242EE) type=0 h:=0+630598=630598, hh:=40 +243: w3 199410 h:=630598+199410=830008, hh:=53 +247: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +250: w0 199410 h:=1061786+199410=1261196, hh:=80 +251: set3 4342510("4242EE) type=0 h:=1261196+630598=1891794, hh:=120 +255: w0 199410 h:=1891794+199410=2091204, hh:=132 +256: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +259: w0 199410 h:=2322982+199410=2522392, hh:=160 +260: set3 8536814("8242EE) type=0 h:=2522392+630598=3152990, hh:=200 +264: w0 199410 h:=3152990+199410=3352400, hh:=212 +265: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +268: w0 199410 h:=3584178+199410=3783588, hh:=240 +269: set3 8798958("8642EE) type=0 h:=3783588+630598=4414186, hh:=280 +[𤋮 ・ 𤋮︀ ・ 𤋮󠄀 ・ 𤋮󠄁] +273: pop +level 1:(h=0,v=2228224,w=0,x=0,y=786432,z=0,hh=0,vv=141) +274: y0 786432 v:=2228224+786432=3014656, vv:=191 +275: push +level 1:(h=0,v=3014656,w=0,x=0,y=786432,z=0,hh=0,vv=191) +276: set3 148206("242EE) type=0 h:=0+630598=630598, hh:=40 +280: w3 199410 h:=630598+199410=830008, hh:=53 +284: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +287: w0 199410 h:=1061786+199410=1261196, hh:=80 +288: set3 4342510("4242EE) type=0 h:=1261196+630598=1891794, hh:=120 +292: w0 199410 h:=1891794+199410=2091204, hh:=132 +293: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +296: w0 199410 h:=2322982+199410=2522392, hh:=160 +297: set3 8536814("8242EE) type=0 h:=2522392+630598=3152990, hh:=200 +301: w0 199410 h:=3152990+199410=3352400, hh:=212 +302: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +305: w0 199410 h:=3584178+199410=3783588, hh:=240 +306: set3 8798958("8642EE) type=0 h:=3783588+630598=4414186, hh:=280 +[𤋮 ・ 𤋮︀ ・ 𤋮󠄀 ・ 𤋮󠄁] +310: pop +level 1:(h=0,v=3014656,w=0,x=0,y=786432,z=0,hh=0,vv=191) +311: y0 786432 v:=3014656+786432=3801088, vv:=241 +312: push +level 1:(h=0,v=3801088,w=0,x=0,y=786432,z=0,hh=0,vv=241) +313: set2 12363("304B) type=0 h:=0+630598=630598, hh:=40 +316: w3 199410 h:=630598+199410=830008, hh:=53 +320: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +323: w0 199410 h:=1061786+199410=1261196, hh:=80 +324: set2 12364("304C) type=0 h:=1261196+630598=1891794, hh:=120 +327: w0 199410 h:=1891794+199410=2091204, hh:=132 +328: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +331: w0 199410 h:=2322982+199410=2522392, hh:=160 +332: set3 2371659("24304B) type=0 h:=2522392+630598=3152990, hh:=200 +336: w0 199410 h:=3152990+199410=3352400, hh:=212 +337: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +340: w0 199410 h:=3584178+199410=3783588, hh:=240 +341: set3 2371659("24304B) type=0 h:=3783588+630598=4414186, hh:=280 +345: w0 199410 h:=4414186+199410=4613596, hh:=292 +346: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +349: w0 199410 h:=4845374+199410=5044784, hh:=320 +350: set3 2240578("223042) type=0 h:=5044784+630598=5675382, hh:=360 +354: w0 199410 h:=5675382+199410=5874792, hh:=372 +355: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +358: w0 199410 h:=6106570+199410=6305980, hh:=399 +359: set3 2338982("23B0A6) type=0 h:=6305980+630598=6936578, hh:=439 +[か ・ が ・ か゚ ・ か゚ ・ あ゙ ・ 𛂦゙] +363: pop +level 1:(h=0,v=3801088,w=0,x=0,y=786432,z=0,hh=0,vv=241) +364: y0 786432 v:=3801088+786432=4587520, vv:=291 +365: push +level 1:(h=0,v=4587520,w=0,x=0,y=786432,z=0,hh=0,vv=291) +366: set2 12363("304B) type=0 h:=0+630598=630598, hh:=40 +369: w3 199410 h:=630598+199410=830008, hh:=53 +373: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +376: w0 199410 h:=1061786+199410=1261196, hh:=80 +377: set2 12364("304C) type=0 h:=1261196+630598=1891794, hh:=120 +380: w0 199410 h:=1891794+199410=2091204, hh:=132 +381: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +384: w0 199410 h:=2322982+199410=2522392, hh:=160 +385: set3 2371659("24304B) type=0 h:=2522392+630598=3152990, hh:=200 +389: w0 199410 h:=3152990+199410=3352400, hh:=212 +390: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +393: w0 199410 h:=3584178+199410=3783588, hh:=240 +394: set3 2371659("24304B) type=0 h:=3783588+630598=4414186, hh:=280 +398: w0 199410 h:=4414186+199410=4613596, hh:=292 +399: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +402: w0 199410 h:=4845374+199410=5044784, hh:=320 +403: set3 2240578("223042) type=0 h:=5044784+630598=5675382, hh:=360 +407: w0 199410 h:=5675382+199410=5874792, hh:=372 +408: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +411: w0 199410 h:=6106570+199410=6305980, hh:=399 +412: set3 2338982("23B0A6) type=0 h:=6305980+630598=6936578, hh:=439 +[か ・ が ・ か゚ ・ か゚ ・ あ゙ ・ 𛂦゙] +416: pop +level 1:(h=0,v=4587520,w=0,x=0,y=786432,z=0,hh=0,vv=291) +417: y0 786432 v:=4587520+786432=5373952, vv:=340 +418: push +level 1:(h=0,v=5373952,w=0,x=0,y=786432,z=0,hh=0,vv=340) +419: set2 9995("270B) type=0 h:=0+630598=630598, hh:=40 +422: w3 199410 h:=630598+199410=830008, hh:=53 +426: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +429: w0 199410 h:=1061786+199410=1261196, hh:=80 +430: set3 2500363("26270B) type=0 h:=1261196+630598=1891794, hh:=120 +434: w0 199410 h:=1891794+199410=2091204, hh:=132 +435: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +438: w0 199410 h:=2322982+199410=2522392, hh:=160 +439: set3 2631435("28270B) type=0 h:=2522392+630598=3152990, hh:=200 +443: w0 199410 h:=3152990+199410=3352400, hh:=212 +444: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +447: w0 199410 h:=3584178+199410=3783588, hh:=240 +448: set3 2762507("2A270B) type=0 h:=3783588+630598=4414186, hh:=280 +452: w0 199410 h:=4414186+199410=4613596, hh:=292 +453: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +456: w0 199410 h:=4845374+199410=5044784, hh:=320 +457: set3 2893579("2C270B) type=0 h:=5044784+630598=5675382, hh:=360 +461: w0 199410 h:=5675382+199410=5874792, hh:=372 +462: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +465: w0 199410 h:=6106570+199410=6305980, hh:=399 +466: set3 3024651("2E270B) type=0 h:=6305980+630598=6936578, hh:=439 +[✋ ・ ✋🏻 ・ ✋🏼 ・ ✋🏽 ・ ✋🏾 ・ ✋🏿] +470: pop +level 1:(h=0,v=5373952,w=0,x=0,y=786432,z=0,hh=0,vv=340) +471: y0 786432 v:=5373952+786432=6160384, vv:=390 +472: push +level 1:(h=0,v=6160384,w=0,x=0,y=786432,z=0,hh=0,vv=390) +473: set2 9995("270B) type=0 h:=0+630598=630598, hh:=40 +476: w3 199410 h:=630598+199410=830008, hh:=53 +480: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +483: w0 199410 h:=1061786+199410=1261196, hh:=80 +484: set3 2500363("26270B) type=0 h:=1261196+630598=1891794, hh:=120 +488: w0 199410 h:=1891794+199410=2091204, hh:=132 +489: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +492: w0 199410 h:=2322982+199410=2522392, hh:=160 +493: set3 2631435("28270B) type=0 h:=2522392+630598=3152990, hh:=200 +497: w0 199410 h:=3152990+199410=3352400, hh:=212 +498: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +501: w0 199410 h:=3584178+199410=3783588, hh:=240 +502: set3 2762507("2A270B) type=0 h:=3783588+630598=4414186, hh:=280 +506: w0 199410 h:=4414186+199410=4613596, hh:=292 +507: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +510: w0 199410 h:=4845374+199410=5044784, hh:=320 +511: set3 2893579("2C270B) type=0 h:=5044784+630598=5675382, hh:=360 +515: w0 199410 h:=5675382+199410=5874792, hh:=372 +516: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +519: w0 199410 h:=6106570+199410=6305980, hh:=399 +520: set3 3024651("2E270B) type=0 h:=6305980+630598=6936578, hh:=439 +[✋ ・ ✋🏻 ・ ✋🏼 ・ ✋🏽 ・ ✋🏾 ・ ✋🏿] +524: pop +level 1:(h=0,v=6160384,w=0,x=0,y=786432,z=0,hh=0,vv=390) +525: y0 786432 v:=6160384+786432=6946816, vv:=440 +526: push +level 1:(h=0,v=6946816,w=0,x=0,y=786432,z=0,hh=0,vv=440) +527: set3 128118("1F476) type=0 h:=0+630598=630598, hh:=40 +531: w3 199410 h:=630598+199410=830008, hh:=53 +535: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +538: w0 199410 h:=1061786+199410=1261196, hh:=80 +539: set3 2618486("27F476) type=0 h:=1261196+630598=1891794, hh:=120 +543: w0 199410 h:=1891794+199410=2091204, hh:=132 +544: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +547: w0 199410 h:=2322982+199410=2522392, hh:=160 +548: set3 2749558("29F476) type=0 h:=2522392+630598=3152990, hh:=200 +552: w0 199410 h:=3152990+199410=3352400, hh:=212 +553: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +556: w0 199410 h:=3584178+199410=3783588, hh:=240 +557: set3 2880630("2BF476) type=0 h:=3783588+630598=4414186, hh:=280 +561: w0 199410 h:=4414186+199410=4613596, hh:=292 +562: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +565: w0 199410 h:=4845374+199410=5044784, hh:=320 +566: set3 3011702("2DF476) type=0 h:=5044784+630598=5675382, hh:=360 +570: w0 199410 h:=5675382+199410=5874792, hh:=372 +571: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +574: w0 199410 h:=6106570+199410=6305980, hh:=399 +575: set3 3142774("2FF476) type=0 h:=6305980+630598=6936578, hh:=439 +[👶 ・ 👶🏻 ・ 👶🏼 ・ 👶🏽 ・ 👶🏾 ・ 👶🏿] +579: pop +level 1:(h=0,v=6946816,w=0,x=0,y=786432,z=0,hh=0,vv=440) +580: y0 786432 v:=6946816+786432=7733248, vv:=490 +581: push +level 1:(h=0,v=7733248,w=0,x=0,y=786432,z=0,hh=0,vv=490) +582: set3 128118("1F476) type=0 h:=0+630598=630598, hh:=40 +586: w3 199410 h:=630598+199410=830008, hh:=53 +590: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +593: w0 199410 h:=1061786+199410=1261196, hh:=80 +594: set3 2618486("27F476) type=0 h:=1261196+630598=1891794, hh:=120 +598: w0 199410 h:=1891794+199410=2091204, hh:=132 +599: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +602: w0 199410 h:=2322982+199410=2522392, hh:=160 +603: set3 2749558("29F476) type=0 h:=2522392+630598=3152990, hh:=200 +607: w0 199410 h:=3152990+199410=3352400, hh:=212 +608: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +611: w0 199410 h:=3584178+199410=3783588, hh:=240 +612: set3 2880630("2BF476) type=0 h:=3783588+630598=4414186, hh:=280 +616: w0 199410 h:=4414186+199410=4613596, hh:=292 +617: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +620: w0 199410 h:=4845374+199410=5044784, hh:=320 +621: set3 3011702("2DF476) type=0 h:=5044784+630598=5675382, hh:=360 +625: w0 199410 h:=5675382+199410=5874792, hh:=372 +626: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +629: w0 199410 h:=6106570+199410=6305980, hh:=399 +630: set3 3142774("2FF476) type=0 h:=6305980+630598=6936578, hh:=439 +[👶 ・ 👶🏻 ・ 👶🏼 ・ 👶🏽 ・ 👶🏾 ・ 👶🏿] +634: pop +level 1:(h=0,v=7733248,w=0,x=0,y=786432,z=0,hh=0,vv=490) +635: y0 786432 v:=7733248+786432=8519680, vv:=540 +636: push +level 1:(h=0,v=8519680,w=0,x=0,y=786432,z=0,hh=0,vv=540) +637: set3 2489075("25FAF3) type=0 h:=0+630598=630598, hh:=40 +641: w3 199410 h:=630598+199410=830008, hh:=53 +645: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +648: w0 199410 h:=1061786+199410=1261196, hh:=80 +649: set3 2484986("25EAFA) type=0 h:=1261196+630598=1891794, hh:=120 +653: w0 199410 h:=1891794+199410=2091204, hh:=132 +654: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +657: w0 199410 h:=2322982+199410=2522392, hh:=160 +658: set3 2483944("25E6E8) type=0 h:=2522392+630598=3152990, hh:=200 +662: w0 199410 h:=3152990+199410=3352400, hh:=212 +663: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +666: w0 199410 h:=3584178+199410=3783588, hh:=240 +667: set3 2486261("25EFF5) type=0 h:=3783588+630598=4414186, hh:=280 +671: w0 199410 h:=4414186+199410=4613596, hh:=292 +672: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +675: w0 199410 h:=4845374+199410=5044784, hh:=320 +676: set3 2490364("25FFFC) type=0 h:=5044784+630598=5675382, hh:=360 +680: w0 199410 h:=5675382+199410=5874792, hh:=372 +681: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +684: w0 199410 h:=6106570+199410=6305980, hh:=399 +685: set3 2483942("25E6E6) type=0 h:=6305980+630598=6936578, hh:=439 +689: w0 199410 h:=6936578+199410=7135988, hh:=452 +[🇺🇳 ・ 🇪🇺 ・ 🇦🇨 ・ 🇯🇵 ・ 🇿🇼 ・ 🇦🇦 ] +690: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +693: w0 199410 h:=7367766+199410=7567176, hh:=479 +694: set3 2490367("25FFFF) type=0 h:=7567176+630598=8197774, hh:=519 +[・ 🇿🇿] +698: pop +level 1:(h=0,v=8519680,w=0,x=0,y=786432,z=0,hh=0,vv=540) +699: y0 786432 v:=8519680+786432=9306112, vv:=589 +700: push +level 1:(h=0,v=9306112,w=0,x=0,y=786432,z=0,hh=0,vv=589) +701: set3 2489075("25FAF3) type=0 h:=0+630598=630598, hh:=40 +705: w3 199410 h:=630598+199410=830008, hh:=53 +709: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +712: w0 199410 h:=1061786+199410=1261196, hh:=80 +713: set3 2484986("25EAFA) type=0 h:=1261196+630598=1891794, hh:=120 +717: w0 199410 h:=1891794+199410=2091204, hh:=132 +718: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +721: w0 199410 h:=2322982+199410=2522392, hh:=160 +722: set3 2483944("25E6E8) type=0 h:=2522392+630598=3152990, hh:=200 +726: w0 199410 h:=3152990+199410=3352400, hh:=212 +727: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +730: w0 199410 h:=3584178+199410=3783588, hh:=240 +731: set3 2486261("25EFF5) type=0 h:=3783588+630598=4414186, hh:=280 +735: w0 199410 h:=4414186+199410=4613596, hh:=292 +736: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +739: w0 199410 h:=4845374+199410=5044784, hh:=320 +740: set3 2490364("25FFFC) type=0 h:=5044784+630598=5675382, hh:=360 +744: w0 199410 h:=5675382+199410=5874792, hh:=372 +745: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +748: w0 199410 h:=6106570+199410=6305980, hh:=399 +749: set3 2483942("25E6E6) type=0 h:=6305980+630598=6936578, hh:=439 +753: w0 199410 h:=6936578+199410=7135988, hh:=452 +[🇺🇳 ・ 🇪🇺 ・ 🇦🇨 ・ 🇯🇵 ・ 🇿🇼 ・ 🇦🇦 ] +754: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +757: w0 199410 h:=7367766+199410=7567176, hh:=479 +758: set3 2490367("25FFFF) type=0 h:=7567176+630598=8197774, hh:=519 +[・ 🇿🇿] +762: pop +level 1:(h=0,v=9306112,w=0,x=0,y=786432,z=0,hh=0,vv=589) +763: y0 786432 v:=9306112+786432=10092544, vv:=639 +764: push +level 1:(h=0,v=10092544,w=0,x=0,y=786432,z=0,hh=0,vv=639) +765: set3 8126499("7C0023) type=0 h:=0+630598=630598, hh:=40 +769: w3 199410 h:=630598+199410=830008, hh:=53 +773: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +776: w0 199410 h:=1061786+199410=1261196, hh:=80 +777: set2 42("2A) type=0 h:=1261196+630598=1891794, hh:=120 +780: set2 65039("FE0F) type=0 h:=1891794+630598=2522392, hh:=160 +783: w0 199410 h:=2522392+199410=2721802, hh:=172 +784: set2 12539("30FB) type=4 h:=2721802+231778=2953580, hh:=187 +787: w0 199410 h:=2953580+199410=3152990, hh:=200 +788: set3 8126512("7C0030) type=0 h:=3152990+630598=3783588, hh:=240 +792: w0 199410 h:=3783588+199410=3982998, hh:=252 +793: set2 12539("30FB) type=4 h:=3982998+231778=4214776, hh:=267 +796: w0 199410 h:=4214776+199410=4414186, hh:=280 +797: set3 8126513("7C0031) type=0 h:=4414186+630598=5044784, hh:=320 +801: w0 199410 h:=5044784+199410=5244194, hh:=332 +802: set2 12539("30FB) type=4 h:=5244194+231778=5475972, hh:=347 +805: w0 199410 h:=5475972+199410=5675382, hh:=359 +806: set3 8126514("7C0032) type=0 h:=5675382+630598=6305980, hh:=399 +810: w0 199410 h:=6305980+199410=6505390, hh:=412 +811: set2 12539("30FB) type=4 h:=6505390+231778=6737168, hh:=427 +814: w0 199410 h:=6737168+199410=6936578, hh:=439 +815: set3 8126520("7C0038) type=0 h:=6936578+630598=7567176, hh:=479 +819: w0 199410 h:=7567176+199410=7766586, hh:=492 +820: set2 12539("30FB) type=4 h:=7766586+231778=7998364, hh:=507 +823: w0 199410 h:=7998364+199410=8197774, hh:=519 +824: set3 8126521("7C0039) type=0 h:=8197774+630598=8828372, hh:=559 +[#️ ・ *️ ・ 0️ ・ 1️ ・ 2️ ・ 8️ ・ 9️] +828: pop +level 1:(h=0,v=10092544,w=0,x=0,y=786432,z=0,hh=0,vv=639) +829: y0 786432 v:=10092544+786432=10878976, vv:=689 +830: push +level 1:(h=0,v=10878976,w=0,x=0,y=786432,z=0,hh=0,vv=689) +831: set3 8126499("7C0023) type=0 h:=0+630598=630598, hh:=40 +835: w3 199410 h:=630598+199410=830008, hh:=53 +839: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +842: w0 199410 h:=1061786+199410=1261196, hh:=80 +843: set3 8126506("7C002A) type=0 h:=1261196+630598=1891794, hh:=120 +847: w0 199410 h:=1891794+199410=2091204, hh:=132 +848: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +851: w0 199410 h:=2322982+199410=2522392, hh:=160 +852: set3 8126512("7C0030) type=0 h:=2522392+630598=3152990, hh:=200 +856: w0 199410 h:=3152990+199410=3352400, hh:=212 +857: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +860: w0 199410 h:=3584178+199410=3783588, hh:=240 +861: set3 8126513("7C0031) type=0 h:=3783588+630598=4414186, hh:=280 +865: w0 199410 h:=4414186+199410=4613596, hh:=292 +866: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +869: w0 199410 h:=4845374+199410=5044784, hh:=320 +870: set3 8126514("7C0032) type=0 h:=5044784+630598=5675382, hh:=360 +874: w0 199410 h:=5675382+199410=5874792, hh:=372 +875: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +878: w0 199410 h:=6106570+199410=6305980, hh:=399 +879: set3 8126520("7C0038) type=0 h:=6305980+630598=6936578, hh:=439 +883: w0 199410 h:=6936578+199410=7135988, hh:=452 +884: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +887: w0 199410 h:=7367766+199410=7567176, hh:=479 +888: set3 8126521("7C0039) type=0 h:=7567176+630598=8197774, hh:=519 +[#️ ・ *️ ・ 0️ ・ 1️ ・ 2️ ・ 8️ ・ 9️] +892: pop +level 1:(h=0,v=10878976,w=0,x=0,y=786432,z=0,hh=0,vv=689) +893: y0 786432 v:=10878976+786432=11665408, vv:=739 +894: push +level 1:(h=0,v=11665408,w=0,x=0,y=786432,z=0,hh=0,vv=739) +895: set3 8388643("800023) type=0 h:=0+630598=630598, hh:=40 +899: w3 199410 h:=630598+199410=830008, hh:=53 +903: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +906: w0 199410 h:=1061786+199410=1261196, hh:=80 +907: set2 42("2A) type=0 h:=1261196+630598=1891794, hh:=120 +910: set2 65039("FE0F) type=0 h:=1891794+630598=2522392, hh:=160 +913: set2 8419("20E3) type=0 h:=2522392+630598=3152990, hh:=200 +916: w0 199410 h:=3152990+199410=3352400, hh:=212 +917: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +920: w0 199410 h:=3584178+199410=3783588, hh:=240 +921: set3 8388656("800030) type=0 h:=3783588+630598=4414186, hh:=280 +925: w0 199410 h:=4414186+199410=4613596, hh:=292 +926: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +929: w0 199410 h:=4845374+199410=5044784, hh:=320 +930: set3 8388657("800031) type=0 h:=5044784+630598=5675382, hh:=360 +934: w0 199410 h:=5675382+199410=5874792, hh:=372 +935: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +938: w0 199410 h:=6106570+199410=6305980, hh:=399 +939: set3 8388658("800032) type=0 h:=6305980+630598=6936578, hh:=439 +943: w0 199410 h:=6936578+199410=7135988, hh:=452 +944: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +947: w0 199410 h:=7367766+199410=7567176, hh:=479 +948: set3 8388664("800038) type=0 h:=7567176+630598=8197774, hh:=519 +952: w0 199410 h:=8197774+199410=8397184, hh:=532 +953: set2 12539("30FB) type=4 h:=8397184+231778=8628962, hh:=547 +956: w0 199410 h:=8628962+199410=8828372, hh:=559 +[#️⃣ ・ *️⃣ ・ 0️⃣ ・ 1️⃣ ・ 2️⃣ ・ 8️⃣ ・ 9️] +957: set3 8388665("800039) type=0 h:=8828372+630598=9458970, hh:=599 +[⃣] +961: pop +level 1:(h=0,v=11665408,w=0,x=0,y=786432,z=0,hh=0,vv=739) +962: y0 786432 v:=11665408+786432=12451840, vv:=789 +963: push +level 1:(h=0,v=12451840,w=0,x=0,y=786432,z=0,hh=0,vv=789) +964: set3 8388643("800023) type=0 h:=0+630598=630598, hh:=40 +968: w3 199410 h:=630598+199410=830008, hh:=53 +972: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +975: w0 199410 h:=1061786+199410=1261196, hh:=80 +976: set3 8388650("80002A) type=0 h:=1261196+630598=1891794, hh:=120 +980: w0 199410 h:=1891794+199410=2091204, hh:=132 +981: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +984: w0 199410 h:=2322982+199410=2522392, hh:=160 +985: set3 8388656("800030) type=0 h:=2522392+630598=3152990, hh:=200 +989: w0 199410 h:=3152990+199410=3352400, hh:=212 +990: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +993: w0 199410 h:=3584178+199410=3783588, hh:=240 +994: set3 8388657("800031) type=0 h:=3783588+630598=4414186, hh:=280 +998: w0 199410 h:=4414186+199410=4613596, hh:=292 +999: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +1002: w0 199410 h:=4845374+199410=5044784, hh:=320 +1003: set3 8388658("800032) type=0 h:=5044784+630598=5675382, hh:=360 +1007: w0 199410 h:=5675382+199410=5874792, hh:=372 +1008: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +1011: w0 199410 h:=6106570+199410=6305980, hh:=399 +1012: set3 8388664("800038) type=0 h:=6305980+630598=6936578, hh:=439 +1016: w0 199410 h:=6936578+199410=7135988, hh:=452 +1017: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +1020: w0 199410 h:=7367766+199410=7567176, hh:=479 +[#️⃣ ・ *️⃣ ・ 0️⃣ ・ 1️⃣ ・ 2️⃣ ・ 8️⃣ ・ 9️] +1021: set3 8388665("800039) type=0 h:=7567176+630598=8197774, hh:=519 +[⃣] +1025: pop +level 1:(h=0,v=12451840,w=0,x=0,y=786432,z=0,hh=0,vv=789) +1026: y0 786432 v:=12451840+786432=13238272, vv:=839 +1027: push +level 1:(h=0,v=13238272,w=0,x=0,y=786432,z=0,hh=0,vv=839) +1028: set3 16535040("FC4E00) type=0 h:=0+630598=630598, hh:=40 +1032: w3 199410 h:=630598+199410=830008, hh:=53 +1036: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +1039: w0 199410 h:=1061786+199410=1261196, hh:=80 +1040: set4 16797324("1004E8C) type=0 h:=1261196+630598=1891794, hh:=120 +1045: w0 199410 h:=1891794+199410=2091204, hh:=132 +1046: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +1049: w0 199410 h:=2322982+199410=2522392, hh:=160 +1050: set4 17059337("1044E09) type=0 h:=2522392+630598=3152990, hh:=200 +1055: w0 199410 h:=3152990+199410=3352400, hh:=212 +1056: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +1059: w0 199410 h:=3584178+199410=3783588, hh:=240 +1060: set4 33576667("20056DB) type=0 h:=3783588+630598=4414186, hh:=280 +1065: w0 199410 h:=4414186+199410=4613596, hh:=292 +1066: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +1069: w0 199410 h:=4845374+199410=5044784, hh:=320 +1070: set4 62934676("3C04E94) type=0 h:=5044784+630598=5675382, hh:=360 +1075: w0 199410 h:=5675382+199410=5874792, hh:=372 +1076: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +1079: w0 199410 h:=6106570+199410=6305980, hh:=399 +1080: set4 66867565("3FC516D) type=0 h:=6305980+630598=6936578, hh:=439 +1085: w0 199410 h:=6936578+199410=7135988, hh:=452 +1086: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +1089: w0 199410 h:=7367766+199410=7567176, hh:=479 +[一󠄟 ・ 二󠄠 ・ 三󠄡 ・ 四󠅠 ・ 五󠇐 ・ 六󠇟 ・ 七] +1090: set4 71060995("43C4E03) type=0 h:=7567176+630598=8197774, hh:=519 +[󠇯] +1095: pop +level 1:(h=0,v=13238272,w=0,x=0,y=786432,z=0,hh=0,vv=839) +1096: y0 786432 v:=13238272+786432=14024704, vv:=888 +1097: push +level 1:(h=0,v=14024704,w=0,x=0,y=786432,z=0,hh=0,vv=888) +1098: set3 16535040("FC4E00) type=0 h:=0+630598=630598, hh:=40 +1102: w3 199410 h:=630598+199410=830008, hh:=53 +1106: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +1109: w0 199410 h:=1061786+199410=1261196, hh:=80 +1110: set4 16797324("1004E8C) type=0 h:=1261196+630598=1891794, hh:=120 +1115: w0 199410 h:=1891794+199410=2091204, hh:=132 +1116: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +1119: w0 199410 h:=2322982+199410=2522392, hh:=160 +1120: set4 17059337("1044E09) type=0 h:=2522392+630598=3152990, hh:=200 +1125: w0 199410 h:=3152990+199410=3352400, hh:=212 +1126: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +1129: w0 199410 h:=3584178+199410=3783588, hh:=240 +1130: set4 33576667("20056DB) type=0 h:=3783588+630598=4414186, hh:=280 +1135: w0 199410 h:=4414186+199410=4613596, hh:=292 +1136: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +1139: w0 199410 h:=4845374+199410=5044784, hh:=320 +1140: set4 62934676("3C04E94) type=0 h:=5044784+630598=5675382, hh:=360 +1145: w0 199410 h:=5675382+199410=5874792, hh:=372 +1146: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +1149: w0 199410 h:=6106570+199410=6305980, hh:=399 +1150: set4 66867565("3FC516D) type=0 h:=6305980+630598=6936578, hh:=439 +1155: w0 199410 h:=6936578+199410=7135988, hh:=452 +1156: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +1159: w0 199410 h:=7367766+199410=7567176, hh:=479 +[一󠄟 ・ 二󠄠 ・ 三󠄡 ・ 四󠅠 ・ 五󠇐 ・ 六󠇟 ・ 七] +1160: set4 71060995("43C4E03) type=0 h:=7567176+630598=8197774, hh:=519 +[󠇯] +1165: pop +level 1:(h=0,v=14024704,w=0,x=0,y=786432,z=0,hh=0,vv=888) +1166: y0 786432 v:=14024704+786432=14811136, vv:=938 +1167: push +level 1:(h=0,v=14811136,w=0,x=0,y=786432,z=0,hh=0,vv=938) +1168: set3 16535040("FC4E00) type=0 h:=0+630598=630598, hh:=40 +1172: w3 199410 h:=630598+199410=830008, hh:=53 +1176: set2 12539("30FB) type=4 h:=830008+231778=1061786, hh:=68 +1179: w0 199410 h:=1061786+199410=1261196, hh:=80 +1180: set4 16797324("1004E8C) type=0 h:=1261196+630598=1891794, hh:=120 +1185: w0 199410 h:=1891794+199410=2091204, hh:=132 +1186: set2 12539("30FB) type=4 h:=2091204+231778=2322982, hh:=147 +1189: w0 199410 h:=2322982+199410=2522392, hh:=160 +1190: set4 17059337("1044E09) type=0 h:=2522392+630598=3152990, hh:=200 +1195: w0 199410 h:=3152990+199410=3352400, hh:=212 +1196: set2 12539("30FB) type=4 h:=3352400+231778=3584178, hh:=227 +1199: w0 199410 h:=3584178+199410=3783588, hh:=240 +1200: set4 33576667("20056DB) type=0 h:=3783588+630598=4414186, hh:=280 +1205: w0 199410 h:=4414186+199410=4613596, hh:=292 +1206: set2 12539("30FB) type=4 h:=4613596+231778=4845374, hh:=307 +1209: w0 199410 h:=4845374+199410=5044784, hh:=320 +1210: set4 62934676("3C04E94) type=0 h:=5044784+630598=5675382, hh:=360 +1215: w0 199410 h:=5675382+199410=5874792, hh:=372 +1216: set2 12539("30FB) type=4 h:=5874792+231778=6106570, hh:=387 +1219: w0 199410 h:=6106570+199410=6305980, hh:=399 +1220: set4 66867565("3FC516D) type=0 h:=6305980+630598=6936578, hh:=439 +1225: w0 199410 h:=6936578+199410=7135988, hh:=452 +1226: set2 12539("30FB) type=4 h:=7135988+231778=7367766, hh:=467 +1229: w0 199410 h:=7367766+199410=7567176, hh:=479 +[一󠄟 ・ 二󠄠 ・ 三󠄡 ・ 四󠅠 ・ 五󠇐 ・ 六󠇟 ・ 七] +1230: set4 71060995("43C4E03) type=0 h:=7567176+630598=8197774, hh:=519 +[󠇯] +1235: pop +level 1:(h=0,v=14811136,w=0,x=0,y=786432,z=0,hh=0,vv=938) +1236: pop +level 0:(h=0,v=42152922,w=0,x=0,y=0,z=0,hh=0,vv=2670) +1237: down3 1572864 v:=42152922+1572864=43725786, vv:=2770 +1241: push +level 0:(h=0,v=43725786,w=0,x=0,y=0,z=0,hh=0,vv=2770) +1242: right4 15229091 h:=0+15229091=15229091, hh:=965 +[ ] +1247: fntdef1 0: cmr10 +1268: fntnum0 current font is cmr10 +1269: setchar49 ("31) h:=15229091+327681=15556772, hh:=986 +[1] +1270: pop +level 0:(h=0,v=43725786,w=0,x=0,y=0,z=0,hh=0,vv=2770) +1271: eop diff --git a/source/texk/web2c/uptexdir/upbibtex.ch b/source/texk/web2c/uptexdir/upbibtex.ch index 0e8c0a4d0..36c444715 100644 --- a/source/texk/web2c/uptexdir/upbibtex.ch +++ b/source/texk/web2c/uptexdir/upbibtex.ch @@ -60,7 +60,7 @@ @d banner=='This is BibTeX, Version 0.99d' {printed when the program starts} @y @d my_name=='upbibtex' -@d banner=='This is upBibTeX, Version 0.99d-j0.36-u1.30' +@d banner=='This is upBibTeX, Version 0.99d-j0.36-u1.35' {printed when the program starts} @z diff --git a/source/texk/web2c/uptexdir/updvitype.ch b/source/texk/web2c/uptexdir/updvitype.ch index 1e5224eb9..52349a28a 100644 --- a/source/texk/web2c/uptexdir/updvitype.ch +++ b/source/texk/web2c/uptexdir/updvitype.ch @@ -9,7 +9,7 @@ @d banner=='This is DVItype, Version 3.6' {printed when the program starts} @y @d my_name=='updvitype' -@d banner=='This is upDVItype, Version 3.6-p221203' +@d banner=='This is upDVItype, Version 3.6-p240427' {printed when the program starts} @z @@ -167,13 +167,33 @@ if c>=177 then text_buf[text_ptr]:=@'77 else text_buf[text_ptr]:=c; end; @ @p procedure out_kanji(c:integer); +var @!v,@!n,@!jj: integer; begin - if text_ptr>=line_length-5 then flush_text; - c:=toBUFF(fromDVI(c)); - if BYTE1(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE1(c); end; - if BYTE2(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE2(c); end; - if BYTE3(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE3(c); end; - incr(text_ptr); text_buf[text_ptr]:=BYTE4(c); + if (isinternalUPTEX) then begin + c:=fromDVI(c); + n:=UVSgetcodepointlength(c); + jj:=1; + while jj<=n do begin + v:=UVSgetcodepointinsequence(c,jj); + if (v>0) then begin + if text_ptr>=line_length-5 then flush_text; + v:=UCStoUTF8(v); + if BYTE1(v)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE1(v); end; + if BYTE2(v)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE2(v); end; + if BYTE3(v)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE3(v); end; + incr(text_ptr); text_buf[text_ptr]:=BYTE4(v); + end; + incr(jj); + end + end + else begin + if text_ptr>=line_length-5 then flush_text; + c:=toBUFF(fromDVI(c)); + if BYTE1(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE1(c); end; + if BYTE2(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE2(c); end; + if BYTE3(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE3(c); end; + incr(text_ptr); text_buf[text_ptr]:=BYTE4(c); + end; end; @ output hexdecimal / octal character code. diff --git a/source/texk/web2c/uptexdir/updvitype.test b/source/texk/web2c/uptexdir/updvitype.test index 5bb559f93..59627e4cf 100755 --- a/source/texk/web2c/uptexdir/updvitype.test +++ b/source/texk/web2c/uptexdir/updvitype.test @@ -38,7 +38,7 @@ for doc in ptex3 ptex4; do done done -for doc in uptex3 uptex4; do +for doc in uptex3 uptex4 uptex5; do $_updvitype $srcdir/uptexdir/tests/$doc.dvi >uptests/x$doc.typ || rc=5 sed 1d uptests/x$doc.typ >uptests/x${doc}a.typ diff $srcdir/uptexdir/tests/${doc}a.typ uptests/x${doc}a.typ || rc=6 diff --git a/source/texk/web2c/uptexdir/uppltotf.ch b/source/texk/web2c/uptexdir/uppltotf.ch index 4c6b7fb9d..15138a657 100644 --- a/source/texk/web2c/uptexdir/uppltotf.ch +++ b/source/texk/web2c/uptexdir/uppltotf.ch @@ -1,5 +1,6 @@ % This is a change file for PLtoTF % +% (2024-04-27) TTK Support upTeX new encoding for combining characters % (2023-09-17) HY Support more than 256 different glue/kern % (2022-12-03) TTK Merge pPLtoTF source/binary into upPLtoTF % (2018-01-27) HY pPLtoTF p2.0 - new JFM spec by texjporg @@ -18,7 +19,7 @@ @d banner=='This is PLtoTF, Version 3.6' {printed when the program starts} @y @d my_name=='uppltotf' -@d banner=='This is upPLtoTF, Version 3.6-p230917' +@d banner=='This is upPLtoTF, Version 3.6-p240427' {printed when the program starts} @z @@ -361,8 +362,8 @@ incr(current_option); We need to include some routines for handling kanji characters. @= -max_kanji=1114111; { maximam number of 2byte characters } -max_kanji_code=@"10FFFF; { maximum ucs code } +max_kanji=@"2FFFFF; { maximam number of multibyte characters } +max_kanji_code=@"2FFFFF; { maximum ucs code } yoko_id_number=11; { is identifier for YOKO-kumi font} tate_id_number=9; { is identifier for TATE-kumi font} @@ -654,7 +655,7 @@ end; @# function valid_jis_code(cx:integer):boolean; begin valid_jis_code:=true; -if (cx>@"10FFFF)or(not is_char_kanji(fromDVI(cx))) +if (cx>max_kanji)or(not is_char_kanji(fromDVI(cx))) or(toDVI(fromDVI(cx))<>cx) then valid_jis_code:=false; end; @# @@ -690,12 +691,23 @@ else if (ch='U')or(ch='u') then @; jis_code:=toDVI(fromUCS(cx)); cur_char:=ch; if not valid_jis_code(jis_code) then - err_print('jis code ', jis_code:1, ' is invalid'); + err_print('ucs code ', jis_code:1, ' is invalid'); end else if multistrlen(ustringcast(buffer), loc+4, loc)>1 then begin cur_char:=" "; - jis_code:=toDVI(fromBUFF(ustringcast(buffer), loc+4, loc)); + jis_code:=fromBUFF(ustringcast(buffer), loc+4, loc); loc:=loc+multistrlen(ustringcast(buffer), loc+4, loc)-1; + if (isinternalUPTEX) then + begin + cx:=fromBUFF(ustringcast(buffer), loc+5, loc+1); + if (UVScombinecode(jis_code,cx)>0) then begin + jis_code:=UVScombinecode(jis_code,cx); + loc:=loc+multistrlen(ustringcast(buffer), loc+5, loc+1); + end; + end + else begin + jis_code:=toDVI(jis_code) + end; if not valid_jis_code(jis_code) then err_print('jis code ', jis_code:1, ' is invalid'); end diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch index f8698ab9a..8c0f66208 100644 --- a/source/texk/web2c/uptexdir/uptex-m.ch +++ b/source/texk/web2c/uptexdir/uptex-m.ch @@ -1,5 +1,5 @@ % $Id$ -% This is a change file for upTeX u1.30 +% This is a change file for upTeX u1.35 % By Takuji Tanaka. % % (02/26/2007) TTK upTeX u0.01 @@ -48,6 +48,7 @@ % (2022-07-23) TTK upTeX u1.29 % (2022-12-09) HK Hironori Kitagawa fixed a bug in \char, \kchar. % (2023-09-16) TTK upTeX u1.30 +% (2024-04-27) TTK upTeX u1.35 @x \def\pTeX{p\kern-.15em\TeX} @@ -62,8 +63,8 @@ {printed when \pTeX\ starts} @# @d upTeX_version=1 -@d upTeX_revision==".30" -@d upTeX_version_string=='-u1.30' {current \upTeX\ version} +@d upTeX_revision==".35" +@d upTeX_version_string=='-u1.35' {current \upTeX\ version} @# @d upTeX_banner=='This is upTeX, Version 3.141592653',pTeX_version_string,upTeX_version_string @d upTeX_banner_k==upTeX_banner @@ -165,6 +166,8 @@ else if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12)) @d min_halfword=-@"3FFFFFFF {smallest allowable value in a |halfword|} @d max_halfword=@"3FFFFFFF {largest allowable value in a |halfword|} @d max_cjk_val=@"1000000 {to separate wchar and kcatcode} +@d max_ivs_val=@"4400000 {to separate wchar with ivs and kcatcode} +@d max_ucs_val=@"110000 {largest Unicode Scalar Value} @z @x @@ -173,12 +176,15 @@ else if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12)) @d other_kchar=18 {kanji codes} @d max_char_code=18 {largest catcode for individual characters} @y +@d latin_ucs=14 {is not cjk characters in ucs code} @d not_cjk=15 {is not cjk characters} @d kanji=16 {kanji} @d kana=17 {hiragana, katakana, alphabet} @d other_kchar=18 {cjk symbol codes} @d hangul=19 {hangul codes} -@d max_char_code=19 {largest catcode for individual characters} +@d modifier=20 {modifier codes} +@d kanji_ivs=23 {kanji with ivs codes} +@d max_char_code=20 {largest catcode for individual characters} @z @x @@ -273,9 +279,16 @@ if (isinternalUPTEX) then begin @t\hskip10pt@>kcat_code(@"93):=hangul; { Hangul Syllables } @t\hskip10pt@>kcat_code(@"94):=hangul; { Hangul Jamo Extended-B } @t\hskip10pt@>kcat_code(@"99):=kanji; { CJK Compatibility Ideographs } + @t\hskip10pt@>kcat_code(@"9C):=modifier; { Variation Selectors } { \hskip10pt|kcat_code(@"A2):=other_kchar;| Halfwidth and Fullwidth Forms } @+@t\1@>for k:=@"10D to @"110 do kcat_code(k):=kana; { Kana Extended-B .. Small Kana Extension } @+@t\1@>for k:=@"13B to @"143 do kcat_code(k):=kanji; { CJK Unified Ideographs Extension B .. H } + @t\hskip10pt@>kcat_code(@"150):=modifier; { Variation Selectors Supplement } + @+@t\1@>for k:=@"165 to @"166 do kcat_code(k):=kana; { Kana with (Semi-)Voiced Sound Mark } + @t\hskip10pt@>kcat_code(@"16A):=kanji; { Standardized Variation Sequence } + @+@t\1@>for k:=@"16C to @"16D do kcat_code(k):=kanji; { Ideographic Variation Sequence } + @+@t\1@>for k:=@"1F9 to @"1FC do kcat_code(k):=modifier; + { Combining Katakana-Hiragana (Semi-)Voiced Sound Mark .. Emoji Modifier Fitzpatrick } @t\hskip10pt@>kcat_code(@"1FD):=not_cjk; { Latin-1 Letters } @t\hskip10pt@>kcat_code(@"1FE):=kana; { Fullwidth digit and latin alphabet } @t\hskip10pt@>kcat_code(@"1FF):=kana; { Halfwidth katakana } @@ -347,20 +360,23 @@ kchar_num: print_esc("kchar"); else begin m:=Hi(info(p)); c:=Lo(info(p)); @y if check_kanji(info(p)) then {|wchar_token|} - begin m:=info(p) div max_cjk_val; c:=info(p) mod max_cjk_val; end + begin + m:=ktokentocmd(info(p)); + c:=ktokentochr(info(p)); + end else begin m:=info(p) div max_char_val; c:=info(p) mod max_char_val; @z @x kanji,kana,other_kchar: print_kanji(KANJI(c)); @y -kanji,kana,other_kchar,hangul: print_kanji(KANJI(c)); +kanji,kana,other_kchar,hangul,modifier: print_kanji(KANJI(c)); @z @x kanji,kana,other_kchar: begin print("kanji character "); @y -kanji,kana,other_kchar,hangul: begin print("kanji character "); +kanji,kana,other_kchar,hangul,modifier: begin print("kanji character "); @z @x @@ -392,7 +408,7 @@ if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10); @x s:=get_avail; info(s):=Lo(info(loc)); @y - s:=get_avail; info(s):=(info(loc) mod max_char_val); + s:=get_avail; info(s):=ktokentochr(info(loc)); @z @x @@ -409,7 +425,8 @@ if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10); begin cur_chr:=fromBUFF(ustringcast(buffer), limit+1, loc); cur_cmd:=kcat_code(kcatcodekey(cur_chr)); - if (multistrlen(ustringcast(buffer), limit+1, loc)>1) and check_kcat_code(cur_cmd) then begin + if (multistrlen(ustringcast(buffer), limit+1, loc)>1) and check_kcat_code(cur_cmd,cur_chr) then begin + if (cur_cmd=latin_ucs) then cur_cmd:=cat_code(cur_chr); if (cur_cmd=not_cjk) then cur_cmd:=other_kchar; for l:=loc to loc-1+multistrlen(ustringcast(buffer), limit+1, loc) do buffer2[l]:=1; @@ -427,7 +444,7 @@ if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10); @y @ @d add_delims_to(#)==#+math_shift,#+tab_mark,#+mac_param, #+sub_mark,#+letter,#+other_char -@d all_jcode(#)==#+kanji,#+kana,#+other_kchar +@d all_jcode(#)==#+kanji,#+kana,#+other_kchar,#+modifier @d hangul_code(#)==#+hangul @z @@ -459,7 +476,8 @@ start_cs: else begin k:=loc; cur_chr:=fromBUFF(ustringcast(buffer), limit+1, k); cat:=kcat_code(kcatcodekey(cur_chr)); - if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat) then begin + if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat,cur_chr) then begin + if (cat=latin_ucs) then cat:=cat_code(cur_chr); if (cat=not_cjk) then cat:=other_kchar; for l:=k to k-1+multistrlen(ustringcast(buffer), limit+1, k) do buffer2[l]:=1; @@ -476,13 +494,13 @@ start_cs: @x else if ((cat=letter)or(cat=kanji)or(cat=kana))and(k<=limit) then @y - else if ((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul))and(k<=limit) then + else if ((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul)or(cat=modifier))and(k<=limit) then @z @x if (cat=kanji)or(cat=kana) then @y - if (cat=kanji)or(cat=kana)or(cat=hangul) then + if (cat=kanji)or(cat=kana)or(cat=hangul)or(cat=modifier) then @z @x @@ -501,7 +519,8 @@ begin repeat cur_chr:=buffer[k]; incr(k); begin repeat cur_chr:=fromBUFF(ustringcast(buffer), limit+1, k); cat:=kcat_code(kcatcodekey(cur_chr)); - if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat) then begin + if (multistrlen(ustringcast(buffer), limit+1, k)>1) and check_kcat_code(cat,cur_chr) then begin + if (cat=latin_ucs) then cat:=cat_code(cur_chr); if (cat=not_cjk) then cat:=other_kchar; for l:=k to k-1+multistrlen(ustringcast(buffer), limit+1, k) do buffer2[l]:=1; @@ -524,9 +543,9 @@ until not((cat=letter)or(cat=kanji)or(cat=kana))or(k>limit); if not((cat=letter)or(cat=kanji)or(cat=kana)) then decr(k); if cat=other_kchar then decr(k); {now |k| points to first nonletter} @y -until not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul))or(k>limit); +until not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul)or(cat=modifier))or(k>limit); {@@;} -if not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul)) then decr(k); +if not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul)or(cat=modifier)) then decr(k); if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to first nonletter} @z @@ -538,21 +557,36 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir begin cur_cmd:=Hi(t); cur_chr:=Lo(t); @y else if check_kanji(t) then {|wchar_token|} - begin cur_cmd:=t div max_cjk_val; cur_chr:=t mod max_cjk_val; end + begin + cur_cmd:=ktokentocmd(t); + cur_chr:=ktokentochr(t); + end else begin cur_cmd:=t div max_char_val; cur_chr:=t mod max_char_val; @z -@x +@x get_token if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|} cur_tok:=cur_chr else cur_tok:=(cur_cmd*@'400)+cur_chr @y - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|} - cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then {|wchar_token|} + if (cur_cmd=kanji)and(cur_chr>=max_cjk_val) then + cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr + else + cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + else if (cur_cmd=latin_ucs) then + cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr else cur_tok:=(cur_cmd*max_char_val)+cur_chr @z +@x +@!j:0..buf_size; {index into |buffer|} +@y +@!j:0..buf_size; {index into |buffer|} +@!v,@!nn,@!jj: integer; +@z + @x if check_kanji(info(p)) then {|wchar_token|} begin buffer[j]:=Hi(info(p)); buffer2[j]:=1; incr(j); buffer2[j]:=1; @@ -561,11 +595,31 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir buffer[j]:=Lo(info(p)); incr(j); p:=link(p); @y if check_kanji(info(p)) then {|wchar_token|} - begin t:=toBUFF(info(p) mod max_cjk_val); - if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end; - if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end; - if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end; - buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j); + begin + if (isinternalUPTEX) then begin + t:=ktokentochr(info(p)); + t:=toUCS(t); + nn:=UVSgetcodepointlength(t); + jj:=1; + while jj0) then begin + v:=UCStoUTF8(v); + if BYTE1(v)<>0 then begin buffer[j]:=BYTE1(v); buffer2[j]:=1; incr(j); end; + if BYTE2(v)<>0 then begin buffer[j]:=BYTE2(v); buffer2[j]:=1; incr(j); end; + if BYTE3(v)<>0 then begin buffer[j]:=BYTE3(v); buffer2[j]:=1; incr(j); end; + buffer[j]:=BYTE4(v); buffer2[j]:=1; incr(j); + end; + incr(jj); + end + end + else begin + t:=toBUFF(info(p) mod max_cjk_val); + if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end; + if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end; + if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end; + buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j); + end; p:=link(p); end else @@ -573,23 +627,33 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir end; @z -@x +@x get_x_token if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then cur_tok:=cur_chr else cur_tok:=(cur_cmd*@'400)+cur_chr @y - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then - cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then + if (cur_cmd=kanji)and(cur_chr>=max_cjk_val) then + cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr + else + cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + else if (cur_cmd=latin_ucs) then + cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr else cur_tok:=(cur_cmd*max_char_val)+cur_chr @z -@x +@x x_token if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then cur_tok:=cur_chr else cur_tok:=(cur_cmd*@'400)+cur_chr @y - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then - cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then + if (cur_cmd=kanji)and(cur_chr>=max_cjk_val) then + cur_tok:=(kanji_ivs*max_cjk_val)+cur_chr + else + cur_tok:=(cur_cmd*max_cjk_val)+cur_chr + else if (cur_cmd=latin_ucs) then + cur_tok:=(cat_code(cur_chr)*max_cjk_val)+cur_chr else cur_tok:=(cur_cmd*max_char_val)+cur_chr @z @@ -634,7 +698,7 @@ primitive("uptexversion",last_item,uptex_version_code); @x if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|} @y - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|} + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then {|wchar_token|} @z @x @@ -659,7 +723,9 @@ while k=@"180 then { there is no |wchar_token| whose code is 0--127. } begin t:=fromBUFFshort(str_pool, pool_ptr, k); cc:=kcat_code(kcatcodekey(t)); + if (cc=latin_ucs) then cc:=other_char; if (cc=not_cjk) then cc:=other_kchar; + if (cc=kanji)and(t>=max_cjk_val) then cc:=kanji_ivs; t:=t+cc*max_cjk_val; k:=k+multistrlenshort(str_pool, pool_ptr, k)-1; end @@ -705,7 +771,7 @@ string_code, meaning_code: begin save_scanner_status:=scanner_status; ptex_revision_code, uptex_revision_code: do_nothing; string_code, meaning_code: begin save_scanner_status:=scanner_status; scanner_status:=normal; get_token; - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|} + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then {|wchar_token|} @z @x @@ -732,7 +798,7 @@ uptex_revision_code: print(upTeX_revision); @x if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then @y -if (cur_cmd>=kanji)and(cur_cmd<=hangul) then +if (cur_cmd>=kanji)and(cur_cmd<=modifier) then @z @x @@ -740,7 +806,22 @@ get_x_token_or_active_char; if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then @y get_x_token_or_active_char; -if (cur_cmd>=kanji)and(cur_cmd<=hangul) then +if (cur_cmd>=kanji)and(cur_cmd<=modifier) then +@z + +@x +@p procedure scan_file_name; +label done; +var + @!save_warning_index: pointer; +begin +@y +@p procedure scan_file_name; +label done; +var + @!save_warning_index: pointer; + @!v,@!nn,@!jj: integer; +begin @z @x @@ -749,13 +830,33 @@ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then append_char(@"100+Hi(cur_chr)); {kanji upper byte} append_char(@"100+Lo(cur_chr)); {kanji lower byte} @y - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|} - begin str_room(4); {4 is maximum} - cur_chr:=toBUFF(cur_chr); - if BYTE1(cur_chr)<>0 then append_char(@"100+BYTE1(cur_chr)); - if BYTE2(cur_chr)<>0 then append_char(@"100+BYTE2(cur_chr)); - if BYTE3(cur_chr)<>0 then append_char(@"100+BYTE3(cur_chr)); - append_char(@"100+BYTE4(cur_chr)); + if (cur_cmd>=kanji)and(cur_cmd<=modifier) then {|wchar_token|} + begin + if (isinternalUPTEX) then begin + cur_chr:=toUCS(cur_chr); + nn:=UVSgetcodepointlength(cur_chr); + jj:=1; + while jj<=nn do begin + v:=UVSgetcodepointinsequence(cur_chr,jj); + if (v>0) then begin + str_room(4); + v:=UCStoUTF8(v); + if BYTE1(v)<>0 then append_char(@"100+BYTE1(v)); + if BYTE2(v)<>0 then append_char(@"100+BYTE2(v)); + if BYTE3(v)<>0 then append_char(@"100+BYTE3(v)); + append_char(@"100+BYTE4(v)); + end; + incr(jj); + end + end + else begin + str_room(4); {4 is maximum} + cur_chr:=toBUFF(cur_chr); + if BYTE1(cur_chr)<>0 then append_char(@"100+BYTE1(cur_chr)); + if BYTE2(cur_chr)<>0 then append_char(@"100+BYTE2(cur_chr)); + if BYTE3(cur_chr)<>0 then append_char(@"100+BYTE3(cur_chr)); + append_char(@"100+BYTE4(cur_chr)); + end; @z @x @@ -763,12 +864,13 @@ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then @y @d set2=129 {typeset a character and move right} @d set3=130 {typeset a character and move right} +@d set4=131 {typeset a character and move right} @z @x jc:=KANJI(info(p)); @y - jc:=KANJI(info(p)) mod max_cjk_val; + jc:=ktokentochr(info(p)); @z @x @@ -776,8 +878,10 @@ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then @y if (jc<@"10000) then begin dvi_out(set2); - end else begin + end else if (jc<@"1000000) then begin dvi_out(set3); dvi_out(BYTE2(jc)); + end else begin + dvi_out(set4); dvi_out(BYTE1(jc)); dvi_out(BYTE2(jc)); end; dvi_out(BYTE3(jc)); dvi_out(BYTE4(jc)); @z @@ -794,7 +898,7 @@ hmode+no_boundary: begin get_x_token; (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar)or (cur_cmd=char_given)or(cur_cmd=char_num) then cancel_boundary:=true; @y -hmode+kanji,hmode+kana,hmode+other_kchar,hmode+hangul: goto main_loop_j; +hmode+kanji,hmode+kana,hmode+other_kchar,hmode+hangul,hmode+modifier: goto main_loop_j; hmode+char_given: if check_echar_range(cur_chr) then goto main_loop else begin cur_cmd:=kcat_code(kcatcodekey(cur_chr)); goto main_loop_j; end; @@ -810,7 +914,7 @@ hmode+kchar_num: begin scan_char_num; cur_chr:=cur_val; end; hmode+no_boundary: begin get_x_token; if (cur_cmd=letter)or(cur_cmd=other_char)or - ((cur_cmd>=kanji)and(cur_cmd<=hangul))or + ((cur_cmd>=kanji)and(cur_cmd<=modifier))or (cur_cmd=char_given)or(cur_cmd=char_num)or (cur_cmd=kchar_given)or(cur_cmd=kchar_num) then cancel_boundary:=true; @z @@ -840,7 +944,7 @@ if cur_cmd=char_num then end; @y if cur_cmd=letter then goto main_loop_lookahead+1; -if (cur_cmd>=kanji)and(cur_cmd<=hangul) then +if (cur_cmd>=kanji)and(cur_cmd<=modifier) then @; if cur_cmd=other_char then goto main_loop_lookahead+1; if cur_cmd=char_given then @@ -851,7 +955,7 @@ if cur_cmd=kchar_given then begin cur_cmd:=kcat_code(kcatcodekey(cur_chr)); @; end; x_token; {now expand and set |cur_cmd|, |cur_chr|, |cur_tok|} if cur_cmd=letter then goto main_loop_lookahead+1; -if (cur_cmd>=kanji)and(cur_cmd<=hangul) then +if (cur_cmd>=kanji)and(cur_cmd<=modifier) then @; if cur_cmd=other_char then goto main_loop_lookahead+1; if cur_cmd=char_given then @@ -882,7 +986,7 @@ vmode+letter,vmode+other_char,vmode+char_num,vmode+char_given, vmode+kchar_num,vmode+kchar_given, vmode+math_shift,vmode+un_hbox,vmode+vrule, vmode+accent,vmode+discretionary,vmode+hskip,vmode+valign, - vmode+kanji,vmode+kana,vmode+other_kchar,vmode+hangul, + vmode+kanji,vmode+kana,vmode+other_kchar,vmode+hangul,vmode+modifier, @z @x @@ -902,7 +1006,10 @@ if check_echar_range(cur_val)=0 then if p<>null then begin link(p):=get_avail; - info(link(p)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; + if (kcat_code(kcatcodekey(cx))=kanji)and(cx>=max_cjk_val) then + info(link(p)):=KANJI(cx) + kanji_ivs*max_cjk_val + else + info(link(p)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; end; @z @@ -930,7 +1037,7 @@ else if cur_cmd=char_given then @y if (cur_cmd=letter)or(cur_cmd=other_char) then q:=new_character(f,cur_chr) -else if (cur_cmd>=kanji)and(cur_cmd<=hangul) then +else if (cur_cmd>=kanji)and(cur_cmd<=modifier) then begin if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; cx:=cur_chr; end @@ -966,7 +1073,10 @@ else if cur_cmd=kchar_num then @y begin q:=new_character(f,get_jfm_pos(KANJI(cx),f)); link(q):=get_avail; - info(link(q)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; + if (kcat_code(kcatcodekey(cx))=kanji)and(cx>=max_cjk_val) then + info(link(q)):=KANJI(cx) + kanji_ivs*max_cjk_val + else + info(link(q)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; last_jchr:=q; @z @@ -986,7 +1096,7 @@ char_num: begin scan_char_num; cur_chr:=cur_val; cur_cmd:=char_given; end; @y KANJI(cx):=cur_chr; -kanji,kana,other_kchar,hangul: cx:=cur_chr; +kanji,kana,other_kchar,hangul,modifier: cx:=cur_chr; kchar_given: KANJI(cx):=cur_chr; char_num: begin scan_char_num; cur_chr:=cur_val; cur_cmd:=char_given; @@ -1002,7 +1112,10 @@ kchar_num: begin scan_char_num; cur_chr:=cur_val; cur_cmd:=kchar_given; math_kcode(p-1):=KANJI(cx); @y math_type(p):=math_jchar; fam(p):=cur_jfam; character(p):=qi(0); - math_kcode(p-1):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; + if (kcat_code(kcatcodekey(cx))=kanji)and(cx>=max_cjk_val) then + math_kcode(p-1):=KANJI(cx) + kanji_ivs*max_cjk_val + else + math_kcode(p-1):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val; @z @x @@ -1023,7 +1136,7 @@ mmode+letter,mmode+other_char,mmode+char_given: if check_echar_range(cur_chr) then set_math_char(ho(math_code(cur_chr))) else set_math_kchar(cur_chr); -mmode+kanji,mmode+kana,mmode+other_kchar,mmode+hangul: begin +mmode+kanji,mmode+kana,mmode+other_kchar,mmode+hangul,mmode+modifier: begin cx:=cur_chr; set_math_kchar(KANJI(cx)); end; mmode+char_num: begin scan_char_num; cur_chr:=cur_val; @@ -1100,7 +1213,7 @@ kchar_given: begin print_esc("kchar"); print_hex(chr_code); if cur_chr=kcat_code_base then m:=kanji else m:=0 @y @ @= -if cur_chr=kcat_code_base then m:=not_cjk else m:=0 +if cur_chr=kcat_code_base then m:=latin_ucs else m:=0 @z @x @@ -1169,7 +1282,7 @@ if font_dir[font(p)]<>dir_default then @y @ @= if font_dir[font(p)]<>dir_default then - begin KANJI(cx):=info(link(p)) mod max_cjk_val; + begin KANJI(cx):=ktokentochr(info(link(p))); @z @x @@ -1177,7 +1290,7 @@ else if font_dir[font(first_char)]<>dir_default then begin KANJI(cx):=info(link(first_char)); @y else if font_dir[font(first_char)]<>dir_default then - begin KANJI(cx):=info(link(first_char)) mod max_cjk_val; + begin KANJI(cx):=ktokentochr(info(link(first_char))); @z @x @@ -1186,7 +1299,7 @@ else if font_dir[font(last_char)]<>dir_default then @y else if font_dir[font(last_char)]<>dir_default then begin insert_skip:=after_wchar; - KANJI(cx):=info(link(last_char)) mod max_cjk_val; + KANJI(cx):=ktokentochr(info(link(last_char))); @z @x @@ -1198,26 +1311,55 @@ begin if is_char_node(link(p)) then begin if is_char_node(link(p)) then begin q:=p; p:=link(p); if font_dir[font(p)]<>dir_default then - begin KANJI(cx):=info(link(p)) mod max_cjk_val; + begin KANJI(cx):=ktokentochr(info(link(p))); @z @x begin KANJI(cx):=info(link(p)); i:=kcat_code(kcatcodekey(cx)); k:=0; if (i=kanji)or(i=kana) then begin t:=q; s:=p; end; @y - begin KANJI(cx):=info(link(p)) mod max_cjk_val; - i:=info(link(p)) div max_cjk_val; k:=0; - if (i=kanji)or(i=kana)or(i=hangul) then begin t:=q; s:=p; end; + begin KANJI(cx):=ktokentochr(info(link(p))); + i:=ktokentocmd(info(link(p))); k:=0; + if (i=kanji)or(i=kana)or(i=hangul)or(i=modifier) then begin t:=q; s:=p; end; @z @x + begin if not disp_called then + begin prev_node:=tail; tail_append(get_node(small_node_size)); + type(tail):=disp_node; disp_dimen(tail):=0; disp_called:=true + end; + fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; + link(tail):=main_p; tail:=main_p; last_jchr:=tail; fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); @y + begin if (cur_cmd=modifier) then begin + KANJI(cx):=info(main_p) mod max_cjk_val; + if (UVScombinecode(cx,cur_chr)>0) then begin + cx:=UVScombinecode(cx,cur_chr); + if (kcat_code(kcatcodekey(KANJI(cx)))=kanji)and(cx>=max_cjk_val) then + info(main_p):=KANJI(cx)+kanji_ivs*max_cjk_val + else + info(main_p):=KANJI(cx)+kcat_code(kcatcodekey(KANJI(cx)))*max_cjk_val; + ins_kp:=false; + goto again_2 + end + end + end; + begin if not disp_called then + begin prev_node:=tail; tail_append(get_node(small_node_size)); + type(tail):=disp_node; disp_dimen(tail):=0; disp_called:=true + end; + fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; + link(tail):=main_p; tail:=main_p; last_jchr:=tail; fast_get_avail(main_p); - if (cur_cmd>=kanji)and(cur_cmd<=hangul) then + if (cur_cmd=kanji)and(cur_chr>=max_cjk_val) then + info(main_p):=KANJI(cur_chr)+kanji_ivs*max_cjk_val + else if (cur_cmd>=kanji)and(cur_cmd<=modifier) then info(main_p):=KANJI(cur_chr)+cur_cmd*max_cjk_val else if cur_cmd=not_cjk then info(main_p):=KANJI(cur_chr)+other_kchar*max_cjk_val + else if cur_cmd=latin_ucs then + info(main_p):=KANJI(cur_chr)+cat_code(cur_chr)*max_cjk_val else { Does this case occur? } info(main_p):=KANJI(cur_chr)+kcat_code(kcatcodekey(KANJI(cur_chr)))*max_cjk_val; @z @@ -1229,7 +1371,7 @@ begin if is_char_node(link(p)) then @y main_i:=orig_char_info(main_f)(cur_l); case cur_cmd of - kanji,kana,other_kchar,hangul: begin + kanji,kana,other_kchar,hangul,modifier: begin @z @x @@ -1248,7 +1390,7 @@ begin if is_char_node(link(p)) then else cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); end; @y - kanji,kana,other_kchar,hangul: cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); + kanji,kana,other_kchar,hangul,modifier: cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); letter,other_char: begin ins_kp:=true; cur_l:=qi(0); end; char_given: begin if check_echar_range(cur_chr) then @@ -1282,17 +1424,37 @@ if s>@"FF then end else print_char(s); @y procedure print_kanji(@!s:KANJI_code); {prints a single character} +var @!v,@!nn,@!jj: integer; begin -s:=toBUFF(s mod max_cjk_val); -if BYTE1(s)<>0 then print_char(@"100+BYTE1(s)); -if BYTE2(s)<>0 then print_char(@"100+BYTE2(s)); -if BYTE3(s)<>0 then print_char(@"100+BYTE3(s)); - print_char(@"100+BYTE4(s)); +if (isinternalUPTEX) then begin + s:=ktokentochr(s); + s:=toUCS(s); + nn:=UVSgetcodepointlength(s); + jj:=1; + while jj<=nn do begin + v:=UVSgetcodepointinsequence(s,jj); + if (v>0) then begin + v:=UCStoUTF8(v); + if BYTE1(v)<>0 then print_char(@"100+BYTE1(v)); + if BYTE2(v)<>0 then print_char(@"100+BYTE2(v)); + if BYTE3(v)<>0 then print_char(@"100+BYTE3(v)); + print_char(@"100+BYTE4(v)); + end; + incr(jj); + end + end +else begin + s:=toBUFF(s mod max_cjk_val); + if BYTE1(s)<>0 then print_char(@"100+BYTE1(s)); + if BYTE2(s)<>0 then print_char(@"100+BYTE2(s)); + if BYTE3(s)<>0 then print_char(@"100+BYTE3(s)); + print_char(@"100+BYTE4(s)); + end; end; -function check_kcat_code(@!ct:integer):integer; +function check_kcat_code(@!ct:integer;@!cx:integer):integer; begin -if ((ct>=kanji)and(enable_cjk_token=0))or(enable_cjk_token=2)then +if (((ct>=kanji)or((ct=latin_ucs)and(cx= @!this_code:integer; {to hold jis code of the current kanji character} @@ -489,7 +490,7 @@ for k:=@'40 to 255 do xchr[k]:=k; @ @= procedure out_kanji(jis_code:integer); { prints a kanji character } -var @!cx:integer; {KANJI code} +var @!cx,@!v,@!nn,@!jj:integer; {KANJI code} i:0..5; {index of array} begin@/ if (charcode_format=charcode_octal)or(jis_code<128) then @@ -515,18 +516,36 @@ if (charcode_format=charcode_octal)or(jis_code<128) then end; end else begin - cx:=toBUFF(fromDVI(jis_code)); - if BYTE1(cx)<>0 then out(xchr[BYTE1(cx)]); - if BYTE2(cx)<>0 then out(xchr[BYTE2(cx)]); - if BYTE3(cx)<>0 then out(xchr[BYTE3(cx)]); - out(xchr[BYTE4(cx)]); + if (isinternalUPTEX) then begin + cx:=fromDVI(jis_code); + nn:=UVSgetcodepointlength(cx); + jj:=1; + while jj<=nn do begin + v:=UVSgetcodepointinsequence(cx,jj); + if (v>0) then begin + v:=UCStoUTF8(v); + if BYTE1(v)<>0 then out(xchr[BYTE1(v)]); + if BYTE2(v)<>0 then out(xchr[BYTE2(v)]); + if BYTE3(v)<>0 then out(xchr[BYTE3(v)]); + out(xchr[BYTE4(v)]); + end; + incr(jj); + end + end + else begin + cx:=toBUFF(fromDVI(jis_code)); + if BYTE1(cx)<>0 then out(xchr[BYTE1(cx)]); + if BYTE2(cx)<>0 then out(xchr[BYTE2(cx)]); + if BYTE3(cx)<>0 then out(xchr[BYTE3(cx)]); + out(xchr[BYTE4(cx)]); + end; end; end; @ @= function valid_jis_code(cx:integer):boolean; begin valid_jis_code:=true; -if (cx>@"10FFFF)or(not is_char_kanji(fromDVI(cx))) +if (cx>max_kanji)or(not is_char_kanji(fromDVI(cx))) or(toDVI(fromDVI(cx))<>cx) then valid_jis_code:=false; end; From 4a287af0402fa0739e0baa96c18a8061475a81af Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Apr 2024 10:52:13 +0000 Subject: [PATCH 03/20] dvispc: Support upTeX new encoding for combining characters git-svn-id: svn://tug.org/texlive/trunk/Build@71093 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/dviout-util/COPYING | 2 +- source/texk/dviout-util/ChangeLog | 8 ++++++++ source/texk/dviout-util/configure | 22 ++++++++++---------- source/texk/dviout-util/configure.ac | 4 ++-- source/texk/dviout-util/dvispc.c | 30 ++++++++++++++++++++-------- 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/source/texk/dviout-util/COPYING b/source/texk/dviout-util/COPYING index a65f337eb..db85f2edf 100644 --- a/source/texk/dviout-util/COPYING +++ b/source/texk/dviout-util/COPYING @@ -2,7 +2,7 @@ Copyright (c) 1998-2011 Toshio OSHIMA, Yoshiki OTOBE, Kazunori ASAYAMA. Copyright (c) 2017-2018 Hironobu YAMASHITA -Copyright (c) 2018-2022 Japanese TeX Development Community +Copyright (c) 2018-2024 Japanese TeX Development Community Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/source/texk/dviout-util/ChangeLog b/source/texk/dviout-util/ChangeLog index c54300719..c5641765c 100644 --- a/source/texk/dviout-util/ChangeLog +++ b/source/texk/dviout-util/ChangeLog @@ -1,3 +1,11 @@ +2024-04-27 TANAKA Takuji + + * dvispc.c: Support upTeX new encoding + for combining characters. + * configure.ac: Version 20240427. + * COPYING: Copyright year. + https://github.com/texjporg/tex-jp-build/issues/46 + 2023-09-17 Hironobu Yamashita * chkdvifont.c: Check JFM with over 256 glue/kern. diff --git a/source/texk/dviout-util/configure b/source/texk/dviout-util/configure index e5e632b11..78aeca926 100755 --- a/source/texk/dviout-util/configure +++ b/source/texk/dviout-util/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for dviout-util (TeX Live) 20230917. +# Generated by GNU Autoconf 2.72 for dviout-util (TeX Live) 20240427. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dviout-util (TeX Live)' PACKAGE_TARNAME='dviout-util--tex-live-' -PACKAGE_VERSION='20230917' -PACKAGE_STRING='dviout-util (TeX Live) 20230917' +PACKAGE_VERSION='20240427' +PACKAGE_STRING='dviout-util (TeX Live) 20240427' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1365,7 +1365,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures dviout-util (TeX Live) 20230917 to adapt to many kinds of systems. +'configure' configures dviout-util (TeX Live) 20240427 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1437,7 +1437,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dviout-util (TeX Live) 20230917:";; + short | recursive ) echo "Configuration of dviout-util (TeX Live) 20240427:";; esac cat <<\_ACEOF @@ -1559,7 +1559,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dviout-util (TeX Live) configure 20230917 +dviout-util (TeX Live) configure 20240427 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2101,7 +2101,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dviout-util (TeX Live) $as_me 20230917, which was +It was created by dviout-util (TeX Live) $as_me 20240427, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -8662,7 +8662,7 @@ fi # Define the identity of the package. PACKAGE='dviout-util--tex-live-' - VERSION='20230917' + VERSION='20240427' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15011,7 +15011,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dviout-util (TeX Live) config.lt 20230917 +dviout-util (TeX Live) config.lt 20240427 configured by $0, generated by GNU Autoconf 2.72. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16652,7 +16652,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dviout-util (TeX Live) $as_me 20230917, which was +This file was extended by dviout-util (TeX Live) $as_me 20240427, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16720,7 +16720,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dviout-util (TeX Live) config.status 20230917 +dviout-util (TeX Live) config.status 20240427 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/source/texk/dviout-util/configure.ac b/source/texk/dviout-util/configure.ac index c93e539d3..01288d942 100644 --- a/source/texk/dviout-util/configure.ac +++ b/source/texk/dviout-util/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright 2018-2023 Japanese TeX Development Community +dnl Copyright 2018-2024 Japanese TeX Development Community dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dviout-util (TeX Live)], [20230917], [tex-k@tug.org]) +AC_INIT([dviout-util (TeX Live)], [20240427], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([dvispc.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/source/texk/dviout-util/dvispc.c b/source/texk/dviout-util/dvispc.c index 5f28d7e0b..7939fbcb8 100644 --- a/source/texk/dviout-util/dvispc.c +++ b/source/texk/dviout-util/dvispc.c @@ -1906,8 +1906,8 @@ uint work(FILE *dvi) uint csum; #ifdef PTEXENC int imb; - long wch; - char mbstr[4]; + long wch, wcp; + char mbstr[9]; #else int h_code, l_code; #endif @@ -1963,12 +1963,26 @@ uint work(FILE *dvi) // internal-euc/sjis: fromDVI cannot convert ASCII range if (is_internalUPTEX() || (isjis(code>>8) && isjis(code&0xff))) { wch = fromDVI(code); - if (is_internalUPTEX()) wch = UCStoUTF8(wch); - imb = 0; memset(mbstr, '\0', 4); - if (BYTE1(wch) != 0) mbstr[imb++]=BYTE1(wch); - if (BYTE2(wch) != 0) mbstr[imb++]=BYTE2(wch); - if (BYTE3(wch) != 0) mbstr[imb++]=BYTE3(wch); - /* always */ mbstr[imb++]=BYTE4(wch); + imb = 0; memset(mbstr, '\0', 9); + if (is_internalUPTEX()) { + int j, len; + len = UVS_get_codepoint_length(wch); + for (j=1; j<=len; j++) { + wcp = UVS_get_codepoint_in_sequence(wch,j); + if (wcp>0) { + wcp = UCStoUTF8(wcp); + if (BYTE1(wcp) != 0) mbstr[imb++]=BYTE1(wcp); + if (BYTE2(wcp) != 0) mbstr[imb++]=BYTE2(wcp); + if (BYTE3(wcp) != 0) mbstr[imb++]=BYTE3(wcp); + /* always */ mbstr[imb++]=BYTE4(wcp); + } + } + } else { + if (BYTE1(wch) != 0) mbstr[imb++]=BYTE1(wch); + if (BYTE2(wch) != 0) mbstr[imb++]=BYTE2(wch); + if (BYTE3(wch) != 0) mbstr[imb++]=BYTE3(wch); + /* always */ mbstr[imb++]=BYTE4(wch); + } fprintf(fp_out, (f_dtl&DTL_CHAR2)?" %u \"":" 0x%x \"", code); fputs2(mbstr, fp_out); From 6e2c210851bae432a9919cec411c34752b547e9d Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Apr 2024 13:01:15 +0000 Subject: [PATCH 04/20] dvipdfm-x: Support upTeX new encoding for combining characters via virtual fonts git-svn-id: svn://tug.org/texlive/trunk/Build@71094 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/dvipdfm-x/ChangeLog | 14 + source/texk/dvipdfm-x/Makefile.am | 13 +- source/texk/dvipdfm-x/Makefile.in | 17 +- source/texk/dvipdfm-x/cidtype2.c | 89 +- source/texk/dvipdfm-x/configure | 22 +- source/texk/dvipdfm-x/configure.ac | 2 +- source/texk/dvipdfm-x/dvipdfmx-upjf2.test | 46 + source/texk/dvipdfm-x/tests/Makefile_upjf | 20 + source/texk/dvipdfm-x/tests/upjf-c.pl | 24 + source/texk/dvipdfm-x/tests/upjf-c.tfm | Bin 0 -> 172 bytes source/texk/dvipdfm-x/tests/upjf-hara.map | 20 + source/texk/dvipdfm-x/tests/upjf.map | 6 + source/texk/dvipdfm-x/tests/upjf.pl | 161 + source/texk/dvipdfm-x/tests/upjf1-r.pl | 8 +- source/texk/dvipdfm-x/tests/upjf1-r.tfm | Bin 432 -> 432 bytes source/texk/dvipdfm-x/tests/upjf2.dvi | Bin 0 -> 840 bytes source/texk/dvipdfm-x/tests/upjf2.tex | 22 + source/texk/dvipdfm-x/tests/upjf2_full.vf | Bin 0 -> 7168 bytes source/texk/dvipdfm-x/tests/upjf2_full.zvp0 | 2928 +++++++++++++++++++ source/texk/dvipdfm-x/tests/upjv-c.pl | 25 + source/texk/dvipdfm-x/tests/upjv-c.tfm | Bin 0 -> 172 bytes source/texk/dvipdfm-x/tests/upjv.pl | 134 + source/texk/dvipdfm-x/tests/upjv2_full.vf | Bin 0 -> 7168 bytes source/texk/dvipdfm-x/tests/upjv2_full.zvp0 | 2928 +++++++++++++++++++ source/texk/dvipdfm-x/tfm.c | 42 +- source/texk/dvipdfm-x/tfm.h | 3 + source/texk/dvipdfm-x/vf.c | 2 +- 27 files changed, 6426 insertions(+), 100 deletions(-) create mode 100755 source/texk/dvipdfm-x/dvipdfmx-upjf2.test create mode 100644 source/texk/dvipdfm-x/tests/upjf-c.pl create mode 100644 source/texk/dvipdfm-x/tests/upjf-c.tfm create mode 100644 source/texk/dvipdfm-x/tests/upjf-hara.map create mode 100644 source/texk/dvipdfm-x/tests/upjf.pl create mode 100644 source/texk/dvipdfm-x/tests/upjf2.dvi create mode 100644 source/texk/dvipdfm-x/tests/upjf2.tex create mode 100644 source/texk/dvipdfm-x/tests/upjf2_full.vf create mode 100644 source/texk/dvipdfm-x/tests/upjf2_full.zvp0 create mode 100644 source/texk/dvipdfm-x/tests/upjv-c.pl create mode 100644 source/texk/dvipdfm-x/tests/upjv-c.tfm create mode 100644 source/texk/dvipdfm-x/tests/upjv.pl create mode 100644 source/texk/dvipdfm-x/tests/upjv2_full.vf create mode 100644 source/texk/dvipdfm-x/tests/upjv2_full.zvp0 diff --git a/source/texk/dvipdfm-x/ChangeLog b/source/texk/dvipdfm-x/ChangeLog index ac9e5832a..8703afe73 100644 --- a/source/texk/dvipdfm-x/ChangeLog +++ b/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,17 @@ +2024-04-27 TANAKA Takuji + + * tfm.{c,h}, vf.c: Support upTeX new encoding + for combining characters via virtual fonts. + * cidtype2.c: Enable to treat Combining Katakana-Hiragana + (Semi-)Voiced Sound Mark in cid_to_code(). + * dvipdfmx-upjf2.test, tests/upjf2.{tex,dvi}, tests/upj{f,v}.pl, + tests/upj{f,v}-c.{pl,tfm}, tests/upjf1-r.{pl,tfm}, + tests/upj{f,v}2_full.{vf,zvp0}, tests/upjf{,-hara}.map, + tests/Makefile_upjf, Makefile.am: Add a test for + upTeX new encoding. It requires HaranoAji fonts. + https://github.com/texjporg/tex-jp-build/issues/46 + * configure.ac: version 20240427. + 2024-04-09 TANAKA Takuji * dvipdfmx-incl.test, tests/multi_incl.{tex,dvi}, diff --git a/source/texk/dvipdfm-x/Makefile.am b/source/texk/dvipdfm-x/Makefile.am index cef7f47bf..ac3b3c435 100644 --- a/source/texk/dvipdfm-x/Makefile.am +++ b/source/texk/dvipdfm-x/Makefile.am @@ -249,11 +249,12 @@ DISTCLEANFILES = config.force TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bad.test xdvipdfm-bb.test TESTS += xdvipdfm-bkm.test xdvipdfm-psz.test xdvipdfm-ptx.test xdvipdfm-res.test TESTS += xdvipdfm-rev.test xdvipdfm-ttc.test -TESTS += dvipdfmx-upjf.test dvipdfmx-incl.test +TESTS += dvipdfmx-upjf.test dvipdfmx-upjf2.test dvipdfmx-incl.test xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bad.log xdvipdfm-bb.log \ xdvipdfm-bkm.log xdvipdfm-psz.log xdvipdfm-ptx.log xdvipdfm-res.log \ xdvipdfm-rev.log xdvipdfm-ttc.log \ - dvipdfmx-upjf.log dvipdfmx-incl.log: xdvipdfmx$(EXEEXT) + dvipdfmx-upjf.log dvipdfmx-upjf2.log dvipdfmx-incl.log: \ + xdvipdfmx$(EXEEXT) EXTRA_DIST = $(TESTS) ## xdvipdfmx.test EXTRA_DIST += tests/dvipdfmx.cfg tests/psfonts.map @@ -307,7 +308,13 @@ EXTRA_DIST += tests/upjv-r00.opl tests/upjv-r00.ofm EXTRA_DIST += tests/upjf1-r.pl tests/upjf1-r.tfm EXTRA_DIST += tests/upjf1_full.zvp0 tests/upjf1_full.vf EXTRA_DIST += tests/upjf1_omit.zvp0 tests/upjf1_omit.vf -DISTCLEANFILES += upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm upjf*.pdf +DISTCLEANFILES += upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm upjf_*.pdf upjf1_*.pdf +## dvipdfmx-upjf2.test +EXTRA_DIST += tests/upjf2_full.zvp0 tests/upjf2_full.vf +EXTRA_DIST += tests/upjv2_full.zvp0 tests/upjv2_full.vf +EXTRA_DIST += tests/upjf-c.pl tests/upjf-c.tfm +EXTRA_DIST += tests/upjv-c.pl tests/upjv-c.tfm +DISTCLEANFILES += upjf2_*.pdf ## dvipdfmx-incl.test EXTRA_DIST += tests/multi_incl.dvi tests/multi_incl.tex tests/sue-mp.pdf DISTCLEANFILES += multi_incl.pdf diff --git a/source/texk/dvipdfm-x/Makefile.in b/source/texk/dvipdfm-x/Makefile.in index 44bcb9927..773ca4b98 100644 --- a/source/texk/dvipdfm-x/Makefile.in +++ b/source/texk/dvipdfm-x/Makefile.in @@ -822,11 +822,12 @@ dist_cmapdata_DATA = data/EUC-UCS2 DISTCLEANFILES = config.force image*.pdf xbmc*.pdf annot*.pdf pic*.* \ bookm*.pdf paper*.pdf ptex*.pdf resrc*.pdf reverse.pdf \ ttc*.pdf upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm \ - upjf*.pdf multi_incl.pdf + upjf_*.pdf upjf1_*.pdf upjf2_*.pdf multi_incl.pdf TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bad.test \ xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test \ xdvipdfm-ptx.test xdvipdfm-res.test xdvipdfm-rev.test \ - xdvipdfm-ttc.test dvipdfmx-upjf.test dvipdfmx-incl.test + xdvipdfm-ttc.test dvipdfmx-upjf.test dvipdfmx-upjf2.test \ + dvipdfmx-incl.test EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \ tests/cmr10.pfb tests/cmr10.tfm tests/image.dvi \ tests/image.tex tests/xbmc.dvi tests/xbmc.tex \ @@ -852,9 +853,12 @@ EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \ tests/upjv-g00.ofm tests/upjf-r00.opl tests/upjf-r00.ofm \ tests/upjv-r00.opl tests/upjv-r00.ofm tests/upjf1-r.pl \ tests/upjf1-r.tfm tests/upjf1_full.zvp0 tests/upjf1_full.vf \ - tests/upjf1_omit.zvp0 tests/upjf1_omit.vf tests/multi_incl.dvi \ - tests/multi_incl.tex tests/sue-mp.pdf tests/fullmap.dvi \ - tests/fullmap.tex + tests/upjf1_omit.zvp0 tests/upjf1_omit.vf \ + tests/upjf2_full.zvp0 tests/upjf2_full.vf \ + tests/upjv2_full.zvp0 tests/upjv2_full.vf tests/upjf-c.pl \ + tests/upjf-c.tfm tests/upjv-c.pl tests/upjv-c.tfm \ + tests/multi_incl.dvi tests/multi_incl.tex tests/sue-mp.pdf \ + tests/fullmap.dvi tests/fullmap.tex all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -2026,7 +2030,8 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPE xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bad.log xdvipdfm-bb.log \ xdvipdfm-bkm.log xdvipdfm-psz.log xdvipdfm-ptx.log xdvipdfm-res.log \ xdvipdfm-rev.log xdvipdfm-ttc.log \ - dvipdfmx-upjf.log dvipdfmx-incl.log: xdvipdfmx$(EXEEXT) + dvipdfmx-upjf.log dvipdfmx-upjf2.log dvipdfmx-incl.log: \ + xdvipdfmx$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/source/texk/dvipdfm-x/cidtype2.c b/source/texk/dvipdfm-x/cidtype2.c index 6d801bc56..54873627b 100644 --- a/source/texk/dvipdfm-x/cidtype2.c +++ b/source/texk/dvipdfm-x/cidtype2.c @@ -463,73 +463,38 @@ cid_to_code (CMap *cmap, CID cid, int unicode_cmap, int32_t *puvs) return (int32_t) outbuf[0]; else if (outbytesleft == 30) return (int32_t) (outbuf[0] << 8|outbuf[1]); - else if (outbytesleft == 28) { - if (unicode_cmap) { - /* We assume the output encoding is UTF-16. */ - int32_t uc, uvs; - const unsigned char *endptr; - - p = outbuf; - endptr = p + 4; - uc = UC_UTF16BE_decode_char(&p, endptr); - if (p == endptr) - return uc; /* single Unicode characters */ - /* Check following Variation Selectors */ - uvs = UC_UTF16BE_decode_char(&p, endptr); - if (p == endptr && uvs >= 0xfe00 && uvs <= 0xfe0f) { + else if (outbytesleft == 28 && !unicode_cmap) + return (int32_t) (outbuf[0] << 24)|(outbuf[1] << 16)|(outbuf[2] << 8)|outbuf[3]; + else if ((outbytesleft == 28 || outbytesleft == 26 || outbytesleft == 24) + && unicode_cmap) { + /* We assume the output encoding is UTF-16. */ + int32_t uc, uvs; + const unsigned char *endptr; + + p = outbuf; + endptr = p + 32 - outbytesleft; + uc = UC_UTF16BE_decode_char(&p, endptr); + if (p == endptr) + return uc; /* single Unicode characters */ + /* Check following Variation Selectors */ + uvs = UC_UTF16BE_decode_char(&p, endptr); + if (p == endptr) { + if (uvs >= 0xfe00 && uvs <= 0xfe0f) { /* Standardized Variation Sequence */ *puvs = uvs; return uc; + } else if (uvs >= 0xe0100 && uvs <= 0xe01ef) { + /* Ideographic Variation Sequence */ + *puvs = uvs; + return uc; + } else if (uvs == 0x3099 || uvs == 0x309a) { + /* Combining Katakana-Hiragana (Semi-)Voiced Sound Mark */ + *puvs = uvs; + return uc; } - WARN("CID=%u mapped to non-single Unicode characters...", cid); - return -1; - } else { - return (outbuf[0] << 24)|(outbuf[1] << 16)|(outbuf[2] << 8)|outbuf[3]; - } - } else if (outbytesleft == 26) { /* 6 bytes sequence */ - if (unicode_cmap) { - /* We assume the output encoding is UTF-16. */ - int32_t uc, uvs; - const unsigned char *endptr; - - p = outbuf; - endptr = p + 6; - uc = UC_UTF16BE_decode_char(&p, endptr); - uvs = UC_UTF16BE_decode_char(&p, endptr); - if (p == endptr) { - if (uvs >= 0xfe00 && uvs <= 0xfe0f) { - /* Standardized Variation Sequence */ - *puvs = uvs; - return uc; - } else if (uvs >= 0xe0100 && uvs <= 0xe01ef) { - /* Ideographic Variation Sequence */ - *puvs = uvs; - return uc; - } - } - WARN("CID=%u mapped to non-single Unicode characters...", cid); - return -1; } - } else if (outbytesleft == 24) { /* 8 bytes sequence */ - if (unicode_cmap) { - /* We assume the output encoding is UTF-16. */ - int32_t uc, uvs; - const unsigned char *endptr; - - p = outbuf; - endptr = p + 8; - uc = UC_UTF16BE_decode_char(&p, endptr); - uvs = UC_UTF16BE_decode_char(&p, endptr); - if (p == endptr) { - if (uvs >= 0xe0100 && uvs <= 0xe01ef) { - /* Ideographic Variation Sequence */ - *puvs = uvs; - return uc; - } - } - WARN("CID=%u mapped to non-single Unicode characters...", cid); - return -1; - } + WARN("CID=%u mapped to non-single Unicode characters...", cid); + return -1; } return -1; diff --git a/source/texk/dvipdfm-x/configure b/source/texk/dvipdfm-x/configure index 1982b3e84..44bb2d0c2 100755 --- a/source/texk/dvipdfm-x/configure +++ b/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240305. +# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240427. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20240305' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20240305' +PACKAGE_VERSION='20240427' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20240427' PACKAGE_BUGREPORT='dvipdfmx@tug.org' PACKAGE_URL='' @@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures dvipdfm-x (TeX Live) 20240305 to adapt to many kinds of systems. +'configure' configures dvipdfm-x (TeX Live) 20240427 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240305:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240427:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20240305 +dvipdfm-x (TeX Live) configure 20240427 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2367,7 +2367,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dvipdfm-x (TeX Live) $as_me 20240305, which was +It was created by dvipdfm-x (TeX Live) $as_me 20240427, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -8928,7 +8928,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20240305' + VERSION='20240427' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15995,7 +15995,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20240305 +dvipdfm-x (TeX Live) config.lt 20240427 configured by $0, generated by GNU Autoconf 2.72. Copyright (C) 2011 Free Software Foundation, Inc. @@ -17938,7 +17938,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dvipdfm-x (TeX Live) $as_me 20240305, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20240427, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18010,7 +18010,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20240305 +dvipdfm-x (TeX Live) config.status 20240427 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/source/texk/dvipdfm-x/configure.ac b/source/texk/dvipdfm-x/configure.ac index faf55681f..87ddbc11d 100644 --- a/source/texk/dvipdfm-x/configure.ac +++ b/source/texk/dvipdfm-x/configure.ac @@ -8,7 +8,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dvipdfm-x (TeX Live)], [20240407], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20240427], [dvipdfmx@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test new file mode 100755 index 000000000..7d76f4788 --- /dev/null +++ b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test @@ -0,0 +1,46 @@ +#! /bin/sh -vx +# $Id$ +# Copyright 2020-2024 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +KpsDir=${KpsDir:-../kpathsea} +BinDir=${BinDir:-.} +ExeExt=${ExeExt:-} +_kpsewhich=$KpsDir/kpsewhich$ExeExt +_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt + +TEXMFCNF=$srcdir/../kpathsea +TFMFONTS=".;$srcdir/tests;$srcdir/data" +T1FONTS="$srcdir/tests;$srcdir/data" +TEXFONTMAPS="$srcdir/tests;$srcdir/data" +DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data" +TEXPICTS=$srcdir/tests +TEXFONTS=".;$srcdir/tests" +SOURCE_DATE_EPOCH=1588474800 +export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS SOURCE_DATE_EPOCH + +failed= + +rm -f upjf.vf upjv.vf upjf-g.ofm upjv-g.ofm upjf-r.ofm upjv-r.ofm upjf-r.tfm + +##### following tests require HaranoAji fonts ##### + +$_kpsewhich HaranoAjiMincho-Regular.otf +otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 +OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` +export OPENTYPEFONTS + + +echo "*** dvipdfmx: test for upjf2_full-hara.pdf" && echo \ + && cp $srcdir/tests/upjf2_full.vf ./upjf.vf \ + && cp $srcdir/tests/upjv2_full.vf ./upjv.vf \ + && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-hara.map -o upjf2.pdf $srcdir/tests/upjf2.dvi \ + && mv ./upjf2.pdf ./upjf2_full-hara.pdf \ + && echo && echo "dvipdfmx-upjf2-vf_full-hara tests OK" && echo \ + || failed="$failed dvipdfmx-upjf2-vf_full-hara" + + +test -z "$failed" && exit 0 +echo +echo "failed tests:$failed" +exit 1 diff --git a/source/texk/dvipdfm-x/tests/Makefile_upjf b/source/texk/dvipdfm-x/tests/Makefile_upjf index 254240617..3f33d1d82 100644 --- a/source/texk/dvipdfm-x/tests/Makefile_upjf +++ b/source/texk/dvipdfm-x/tests/Makefile_upjf @@ -47,6 +47,18 @@ upjf1_full.vf: upjf1_omit.vf: jfmutil zvp02vf upjf1_omit.zvp0 +upjf2_full.vf: + jfmutil zvp02vf upjf2_full.zvp0 + +upjv2_full.vf: + jfmutil zvp02vf upjv2_full.zvp0 + +upjf-c.tfm: + uppltotf upjf-c.pl + +upjv-c.tfm: + uppltotf upjv-c.pl + upjf.dvi: upjf.tex uplatex upjf.tex dvispc -a upjf.dvi upjf.dvitxt @@ -55,3 +67,11 @@ upjf.dvi: upjf.tex dvispc -x upjf.dvitxt upjf.dvi rm upjf.dvitxt +upjf2.dvi: upjf2.tex + uplatex upjf2.tex + dvispc -a upjf2.dvi upjf2.dvitxt + sed -i '/xxx/d' upjf2.dvitxt + sed -i -e "4i xxx1 176 'pdf:docinfo<>'" upjf2.dvitxt + dvispc -x upjf2.dvitxt upjf2.dvi + rm upjf2.dvitxt + diff --git a/source/texk/dvipdfm-x/tests/upjf-c.pl b/source/texk/dvipdfm-x/tests/upjf-c.pl new file mode 100644 index 000000000..e76699f7a --- /dev/null +++ b/source/texk/dvipdfm-x/tests/upjf-c.pl @@ -0,0 +1,24 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(FAMILY UPJIS KANJI) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 0) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.1) + (SHRINK R 0.0) + (XHEIGHT R 1.0) + (QUAD R 1.0) + (EXTRASPACE R 0.25) + (EXTRASTRETCH R 0.2) + (EXTRASHRINK R 0.125) + ) +(TYPE O 0 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) diff --git a/source/texk/dvipdfm-x/tests/upjf-c.tfm b/source/texk/dvipdfm-x/tests/upjf-c.tfm new file mode 100644 index 0000000000000000000000000000000000000000..9a525bb5a8af787c1d71dd6f390f4ff5caaf896f GIT binary patch literal 172 zcmZSJW?*E{W)NZk0VXhH1hW|!IKlJ+1_r(m*9Zk~M?Wu51t2Q~Dve2ThX#0g218WB rWE-FiMnNb;07~!KF!AsmUc8Z@TBa zojyZT-?=C?u_V7p!zU5sjPlHq426u!g4Cj-)HF?f$I_AvpxmPw%?giZG-&Dv6y>Ls zCZ`r@q?Ba>Ez8x^_fD-W&o4?T)_Ae4^<{s@v%aO)3XhxnA2%&|+&uAd^Pb1es~$IR ze%!R)TH)=~8E@updE2|^_43BIjcYXR?0WkaFs)!<=w0x)f`MTHQx=%H+t{cV2qwDE z_n801*rbzzAuWy3@bbI)0{bTSwlDxmkVxzl-A$gTu;a^JkPG`MeovV98}rH^if`E|j+S3mB7 zr5OayoLRsq!LHQX0wN*4{R<46-iaK*VEXs=$G!iIpY<_3U3LqPr^)x_e5OZ#kv%n0 zfPn$-Fu0#Ujt2RuZ@wG@LtoDipzE}dQ#mM}8C!v(Tnt# literal 0 HcmV?d00001 diff --git a/source/texk/dvipdfm-x/tests/upjf2.tex b/source/texk/dvipdfm-x/tests/upjf2.tex new file mode 100644 index 000000000..3c8883628 --- /dev/null +++ b/source/texk/dvipdfm-x/tests/upjf2.tex @@ -0,0 +1,22 @@ +% Copyright (C) 2020-2024 Japanese TeX Development Community +% You may freely use, modify and/or distribute this file. + +\documentclass{ujarticle} +%\usepackage[T1]{fontenc} +%\usepackage{mathptmx} + +\begin{document} +\pagestyle{empty} +\prebreakpenalty`ㇷ=0 +\font\upjf=upjf at 10pt +\fbox{\hbox{\yoko +\upjf あいうえおか゚ㇷㇷ゚ｱｲｳｴｵ、☃~雪晴☀𠮟。卿卿 卿︂卿󠄀卿󠄁卿󠄂，ABC xyz. +}} + +\tbaselineshift0.3zh +\font\upjv=upjv at 10pt +\fbox{\hbox{\tate +\upjv あいうえおか゚ㇷㇷ゚、☃~雪晴☀𠮟。卿卿 卿︂卿󠄀卿󠄁卿󠄂，ABC xyz. +}} +\end{document} + diff --git a/source/texk/dvipdfm-x/tests/upjf2_full.vf b/source/texk/dvipdfm-x/tests/upjf2_full.vf new file mode 100644 index 0000000000000000000000000000000000000000..fd29f21d56ce888fad5f82271ed14d902fb6168f GIT binary patch literal 7168 zcmZwLRd5t&7C_-9kl^m_!J$J44#C}nI|Kp*5AJku_uw)vfpK>i#@*eSVWw(%m^^G% zZ+GXM-JYt=L*%P-|4veWrEll&tAW_tr9j|D;b#>hA0l4`l2$Ft&T5l$qezVZsq=0m z{2$HyR|Ja%0?C0uB)=R=4hThoqCk)$Xb~(DC=neA7O_YG5(Lf&{`ZVxg@*=4t14Jkq^c-X;>W2ZR0b-0PL;TGs#sO!oT^sU;;L#^)v2mm)rhNVSkqhBTGeB$o=_jCFErqs20}xiq0k6uBs2yZ3r&C~LQ|lrkPIXX z&46Y?bD+7<0%#$$1X>EMfL20lptaBjXd|=*+6wJ}c0v#c3MoK}&>mdp zqk+-F7+{Q$0b~ecfw96kV4N@>7%xl!CI}OOiNYjck}w&VEKC8W2vdQn!Zcu-FddjK z%m8KxGl7}HEMS%}8<;I*0-3@bV2&^sm@8xfS;9PEo-iMnFDw8S2-!fkun<@%ECLn@ zi-E<$5@3n26j&-O1C|NPf#pIDkRz-BRtPJBmBK1um9QFEEvy072y210!a87`upU@1 zYydV08-b0&CSa4W8Q3gr0k#NRfvrLa2no4BuCNW*CTs_`3p;=v!cJhPunX8F>;`rV zdw@N{USO}V57;N{2lfjGfCIuo;Gl2_I3yef4hu(sBf?SOsBjE8CL9Nj3nzdRLLQJO zoCHn^r+`z!Y2dVQ1~?;}1^`3zHwp@WN!pE`NR~%gdj4 zEjp4P%Dcu$I8b;-I3N@OiU0DFDii~X35h_WkOU+N#ew2ch%CL~xYajY!iv>5 zTv8~-SSg`2P+Ewsy_ZAbGD2C3vO;X-jTGgC@)YHT3P1&+B2ZDN1XL0#1C@m;Koy}X zP*tb~R1>NL)rA^B4WTAbGYZk)TH$*8@8}DLa4j*m-sTlzZAa@cT1Ti0)D`Lh^@RFB zeW3x+Kxhaw6dD1IgvLN)p$X7LXbLnHl7VEQ8PH5%y$v@PSZ~8EgqDo76j}kT1lHSd zYoQHA8-evU+*W8u(M|{gK_LZ55!wUog;XF_=m2yO(ttFfBhXRk1auNQ1D%B~Ko^1a zHrzD|(Tme9`o8d$X1JSGcgDI4J)%|QYV{C$QuGwkfpno4&`anI^cMO6eT2S1U!fn+ zPv{Ty7X|8>$!^4E(6vG8p-0%otB*jQ!6fjB{ z4U87X0AqvvR*bc*SoGb8St8CEkHn<>l!W(l)_*+M3eDa--p2y=nCLKcuE%md~L^MU!o0$_oV z4P*-ofrY{%V3DvGSS&07mIzCMrNS~`nXnvKF600?!U|x8uoCduKD-K8Ww9DqEvy07 z2y210!a87`upU@1YydV08-b0&CSa4W8Q3gr0o+`|TY;?>As{5=0=dFAV4JWV*e>h< zb_hFxox(0)m#`byE$jjI2z!CO!aiW1upihj8~_do2Z4jaA>fd37&t5(0gebqfuq7P z;Fxe6I4+z3P6&BGo^TR4DVzdM38#V6!WrOk~k5x6K^;;+ml z;U?fF;b!1w;TGT);a1>Q;Wpql;dbD5;SS&q;ZERA;V$4V;cnn=As@&WE(4c^E5H@u z9^f9~Uf^EgKHxs#e&BxL0pJ1QLEu5*A>bk5Vc=om5#SNwQQ%SGG2k)bao};`3E&Cg zN#IH0Dc~vLY2az$8Q>Y=S>RdWIp8_rdEj~B1>gnYMc_r@CEz9DW#DDu72p-&Rp3?O zHQ+Vjb>Ma3DsWYJ19(Gt6L?d23wTR-8+coI2Y5$#7kF2A4|q>_A9!E*0Qf-o5cp8| z2>3|&82DKD1o%Yw6!=v54ERj=9Qa)L0{BAs68KX13iwL+8u(iH2KYw!7Wh{94){*^ z9{67P0r)}q5%^K~3HV9)8TeWF1^7ky75G*74fsvC23!+<2Ywg+0R9lJ1J{K=fj@=6 zfWM-U7)U66F$(#)kx!6<*h`g&6r>goH3`NRp7qg@L z(K-K$V9`JzEf9$0mqTd*p$Jd}2vP(sf(e1*(UD++MIw+Wa7OUIXA~_wG+5Lk2}lx> zfn=c=P%H|O2MiXEzRoL%J#=xa5xmapzRBs?0f+t*XRTRjjH~Rkf-XS5>pBPF3BiMqE|H zswP!Up%$NLEyrrdjn%fQ!&n`mE>Ksf$2s+c`apf50nk8b2s9K@fmERp&`3xF(uBr9 zW1$JqL}&^$6`BFfgyukVp#{)FNC(n|mOx9P70^lu0zsiQ&{}8%v=Q0@ZH0C~JE1+$ zUg!XH5IO=Kg-$>xp)=4~=mK;Rx&mE=Za_DoJJ4O|0rU`h0zHLZKrf*;&|ByO^bz_3 zeT9BNKcPR+Ul;%k5C#GRg+ag|VK6XQ7y=9th5|!{VZbn9I51oo0gMnv0waY{z$jrf zFj^P`j1e+`3}GxVRu~726UGDMg$cj}VInY5m;_7`CIgd&DZmtADlk=;222yC1Ji{W zzzks~FjJTX%o1h;vxPap9APdnSC|LP6EcBJAq&V7<^%JE1;7GfA+S(b1S}F31B-^ANg*Ct$VJ)y$SO=^V)&uK>4ZsFrBd}4} z1Z)yE1Dk~{z!qUEuvORwY!kA9Y#{`Mgzdm~VF$27$N_SMoxo0E7qCm%4eS=pI_`-J_#e&GOcKsX2-6b=E0gu}pL;RtXYUTPB;&o7cKx7gp0sMAR~5R@L0+NJeAXz8|6pKP+=?%xNzTx6ltiItA zLP^F-3Z;NjLTv559152f%21RMVk>W?C@YksC?})+` zPz9(WR0XOE)qrY3b)b3_qTjW`_4eP+6x_k4njwuqtFTHByVbHoUYN=h0ip@U9Gw?)=lUhts+;eyU>H8htLz~Df9w*3B7^dLLZ=y&==?{^aJ_{ z{ek|%0APSH5Ev-1;)VwathnL9!VpG=2t$FP0xNEKm@u4TxWI}V9wCgR7%7YbMhT;V z(ZU#DjF16j2xEb1sBw&)jiW{CBh3Flb5_d@fGlA?Fke^zED#m~ z3x!3%B4IJGSXcrq5taf=g=N4pVL7l|SOKgMRst)9Rlq7?HQ-z-8eIa7DNW zxJS4bxL3FjxKFqrxLcu9B}cv*M_ctv;>cvW}} zcuja6cwM*(Tov8`-Vojd-W1*f-V)vh-WJ{g-Vxpf-WA>h-V@#j-WNUqJ`g?xJ`_Fz zJ`z3#J{CR!J`p|zJ{3L#J`+9%J{P_Kz7W0yz7)O!z7oC$z81a#z7f6!z7@U$z7xI& zz88J~eh_{HeiVKJeiD8LeinWKei42JeieQLeiN<%*M#4J--SPbKZNVRb>UCoPvI}% zuP7u15=&i-LjLy1J4iw7sY*l&+7=F_24f5Il~B*oK 0x10FFFFUL ? 0x110000UL : i)) +#define CHARACTER_INDEX(i) ((i > UCS_LASTCHAR ? UCS_LASTCHAR+1 : i)) #else #define CHARACTER_INDEX(i) ((i)) #endif @@ -164,6 +164,9 @@ struct coverage { int first_char; int num_chars; +#ifndef WITHOUT_ASCII_PTEX + int last_char; +#endif }; /* @@ -214,8 +217,13 @@ lookup_char (const struct char_map *map, int charcode) if (charcode >= map->coverage.first_char && charcode <= map->coverage.first_char + map->coverage.num_chars) return map->indices[CHARACTER_INDEX(charcode - map->coverage.first_char)]; - else - return -1; + +#ifndef WITHOUT_ASCII_PTEX + if (charcode <= map->coverage.last_char) + return map->indices[0]; +#endif + + return -1; } static int @@ -229,6 +237,10 @@ lookup_range (const struct range_map *map, int charcode) map->coverages[idx].first_char + map->coverages[idx].num_chars) return map->indices[CHARACTER_INDEX(idx)]; } +#ifndef WITHOUT_ASCII_PTEX + if (charcode <= JFM_LASTCHAR) + return map->indices[0]; +#endif return -1; } @@ -464,15 +476,19 @@ jfm_do_char_type_array (FILE *tfm_file, struct tfm_font *tfm) unsigned short chartype; unsigned int i; - tfm->chartypes = NEW(1114112, unsigned int); - for (i = 0; i < 1114112; i++) { + tfm->chartypes = NEW(UCS_LASTCHAR + 1, unsigned int); + for (i = 0; i < (UCS_LASTCHAR + 1); i++) { tfm->chartypes[i] = 0; } for (i = 0; i < tfm->nt; i++) { /* support new JFM spec by texjporg */ charcode = get_unsigned_triple_kanji(tfm_file); chartype = get_unsigned_byte(tfm_file); - tfm->chartypes[charcode] = chartype; + if (charcode < (UCS_LASTCHAR + 1)) + tfm->chartypes[charcode] = chartype; + else { + /* Invalid charcode */ + } } } @@ -487,10 +503,11 @@ jfm_make_charmap (struct font_metric *fm, struct tfm_font *tfm) fm->charmap.data = map = NEW(1, struct char_map); map->coverage.first_char = 0; #ifndef WITHOUT_ASCII_PTEX - map->coverage.num_chars = 0x10FFFFL; - map->indices = NEW(0x110001L, unsigned int); - map->indices[0x110000L] = tfm->chartypes[0]; - for (code = 0; code <= 0x10FFFFU; code++) { + map->coverage.num_chars = UCS_LASTCHAR; + map->coverage.last_char = JFM_LASTCHAR; + map->indices = NEW(UCS_LASTCHAR + 2, unsigned int); + map->indices[UCS_LASTCHAR + 1] = tfm->chartypes[0]; + for (code = 0; code <= UCS_LASTCHAR; code++) { #else map->coverage.num_chars = 0xFFFFL; map->indices = NEW(0x10000L, unsigned short); @@ -507,7 +524,8 @@ jfm_make_charmap (struct font_metric *fm, struct tfm_font *tfm) map->coverages = NEW(map->num_coverages, struct coverage); map->coverages[0].first_char = 0; #ifndef WITHOUT_ASCII_PTEX - map->coverages[0].num_chars = 0x10FFFFL; + map->coverages[0].num_chars = UCS_LASTCHAR; + map->coverages[0].last_char = JFM_LASTCHAR; #else map->coverages[0].num_chars = 0xFFFFL; #endif @@ -812,7 +830,7 @@ read_tfm (struct font_metric *fm, FILE *tfm_file, off_t tfm_file_size) jfm_do_char_type_array(tfm_file, &tfm); jfm_make_charmap(fm, &tfm); fm->firstchar = 0; - fm->lastchar = 0x10FFFFL; + fm->lastchar = JFM_LASTCHAR; fm->fontdir = (tfm.id == JFMV_ID) ? FONT_DIR_VERT : FONT_DIR_HORIZ; fm->source = SOURCE_TYPE_JFM; } diff --git a/source/texk/dvipdfm-x/tfm.h b/source/texk/dvipdfm-x/tfm.h index 1081c0f14..b569cbcbb 100644 --- a/source/texk/dvipdfm-x/tfm.h +++ b/source/texk/dvipdfm-x/tfm.h @@ -25,6 +25,9 @@ #include "numbers.h" +#define UCS_LASTCHAR 0x10FFFFUL +#define JFM_LASTCHAR 0xFFFFFFUL + extern int tfm_open (const char * tex_name, int must_exist); extern void tfm_close_all (void); diff --git a/source/texk/dvipdfm-x/vf.c b/source/texk/dvipdfm-x/vf.c index 79fe93b3e..4f20af227 100644 --- a/source/texk/dvipdfm-x/vf.c +++ b/source/texk/dvipdfm-x/vf.c @@ -416,7 +416,7 @@ void vf_set_char(int32_t ch, int vf_font) !(start = (vf_fonts[vf_font].ch_pkt)[ch])) { int is_jfm = tfm_is_jfm(vf_fonts[vf_font].dev_fonts[0].tfm_id); if (is_jfm && - ch < 0x1000000 && dpx_conf.compat_mode != dpx_mode_xdv_mode) { + ch <= JFM_LASTCHAR && dpx_conf.compat_mode != dpx_mode_xdv_mode) { /* fallback multibyte character for (u)pTeX */ if (dpx_conf.verbose_level == 1) if (vf_fonts[vf_font].message_flag == 0) { From b7e2a80db075bb50d59d3f510c454522efc5cfed Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 27 Apr 2024 13:48:19 +0000 Subject: [PATCH 05/20] dvipdfm-x: tweak test git-svn-id: svn://tug.org/texlive/trunk/Build@71095 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/dvipdfm-x/dvipdfmx-upjf2.test | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test index 7d76f4788..cc5a49b9a 100755 --- a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test +++ b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test @@ -21,8 +21,6 @@ export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS SO failed= -rm -f upjf.vf upjv.vf upjf-g.ofm upjv-g.ofm upjf-r.ofm upjv-r.ofm upjf-r.tfm - ##### following tests require HaranoAji fonts ##### $_kpsewhich HaranoAjiMincho-Regular.otf @@ -30,6 +28,7 @@ otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` export OPENTYPEFONTS +rm -f upjf.vf upjv.vf echo "*** dvipdfmx: test for upjf2_full-hara.pdf" && echo \ && cp $srcdir/tests/upjf2_full.vf ./upjf.vf \ From 0802cc0f7722002e7e7eaa19cadbb5d5531f8d16 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Apr 2024 15:10:14 +0000 Subject: [PATCH 06/20] doc,sync git-svn-id: svn://tug.org/texlive/trunk/Build@71096 c570f23f-e606-0410-a88d-b1316a301751 From ef3a9408ba00002b9fd1b9525e4f0abbc6c02732 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Apr 2024 16:42:00 +0000 Subject: [PATCH 07/20] avoid off64_t error with zziplib in luazip git-svn-id: svn://tug.org/texlive/trunk/Build@71105 c570f23f-e606-0410-a88d-b1316a301751 --- source/libs/cairo/configure | 14 ++ source/libs/configure | 293 ++++++++++++++++++++++ source/libs/gmp/config.h.in | 98 ++++++++ source/libs/gmp/configure | 294 ++++++++++++++++++----- source/libs/gmp/native/config.h.in | 130 ++++++++++ source/libs/gmp/native/configure | 269 +++++++++++++++++++++ source/libs/icu/configure | 269 +++++++++++++++++++++ source/libs/libpaper/configure | 14 ++ source/libs/libpng/config.h.in | 98 ++++++++ source/libs/libpng/configure | 293 +++++++++++++++++----- source/libs/mpfi/configure | 294 ++++++++++++++++++----- source/libs/mpfi/mpfi_config.h.in | 98 ++++++++ source/libs/mpfr/config.h.in | 95 ++++++++ source/libs/mpfr/configure | 294 ++++++++++++++++++----- source/libs/pixman/config.h.in | 98 ++++++++ source/libs/pixman/configure | 294 ++++++++++++++++++----- source/libs/pplib/config.h.in | 98 ++++++++ source/libs/pplib/configure | 294 ++++++++++++++++++----- source/libs/zlib/config.h.in | 98 ++++++++ source/libs/zlib/configure | 294 ++++++++++++++++++----- source/texk/bibtex-x/config.h.in | 98 ++++++++ source/texk/bibtex-x/configure | 294 ++++++++++++++++++----- source/texk/configure | 293 ++++++++++++++++++++++ source/texk/dvi2tty/c-auto.in | 98 ++++++++ source/texk/dvi2tty/configure | 294 ++++++++++++++++++----- source/texk/dvidvi/config.h.in | 98 ++++++++ source/texk/dvidvi/configure | 294 ++++++++++++++++++----- source/texk/dviout-util/config.h.in | 98 ++++++++ source/texk/dviout-util/configure | 294 ++++++++++++++++++----- source/texk/dvipdfm-x/config.h.in | 98 ++++++++ source/texk/dvipdfm-x/configure | 294 ++++++++++++++++++----- source/texk/dvipsk/c-auto.in | 98 ++++++++ source/texk/dvipsk/configure | 294 ++++++++++++++++++----- source/texk/dvipsk/squeeze/configure | 269 +++++++++++++++++++++ source/texk/kpathsea/c-auto.in | 98 ++++++++ source/texk/kpathsea/configure | 294 ++++++++++++++++++----- source/texk/makejvf/c-auto.in | 98 ++++++++ source/texk/makejvf/configure | 294 ++++++++++++++++++----- source/texk/mendexk/c-auto.in | 98 ++++++++ source/texk/mendexk/configure | 294 ++++++++++++++++++----- source/texk/ptexenc/c-auto.in | 98 ++++++++ source/texk/ptexenc/configure | 294 ++++++++++++++++++----- source/texk/seetexk/config.h.in | 98 ++++++++ source/texk/seetexk/configure | 294 ++++++++++++++++++----- source/texk/upmendex/c-auto.in | 98 ++++++++ source/texk/upmendex/configure | 294 ++++++++++++++++++----- source/texk/web2c/ChangeLog | 16 ++ source/texk/web2c/Makefile.in | 10 +- source/texk/web2c/aclocal.m4 | 1 + source/texk/web2c/configure | 80 ++++++ source/texk/web2c/configure.ac | 3 + source/texk/web2c/doc/Makefile.in | 1 + source/texk/web2c/lib/Makefile.in | 1 + source/texk/web2c/man/Makefile.in | 1 + source/texk/web2c/omegafonts/Makefile.in | 1 + source/texk/web2c/otps/Makefile.in | 1 + source/texk/web2c/otps/win32/Makefile.in | 1 + source/texk/web2c/web2c/c-auto.in | 98 ++++++++ source/texk/web2c/web2c/configure | 294 ++++++++++++++++++----- source/texk/web2c/window/Makefile.in | 1 + 60 files changed, 8201 insertions(+), 1303 deletions(-) diff --git a/source/libs/cairo/configure b/source/libs/cairo/configure index b7fa5e5b1..6fe05490d 100755 --- a/source/libs/cairo/configure +++ b/source/libs/cairo/configure @@ -4702,6 +4702,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=cairo, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4958,6 +4960,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4982,6 +4986,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -5015,6 +5024,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -5072,6 +5083,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=cairo, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/source/libs/configure b/source/libs/configure index 68aea89ae..86136aa01 100755 --- a/source/libs/configure +++ b/source/libs/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="../build-aux/missing" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1854,6 +1886,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2196,6 +2263,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2521,6 +2589,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="missing install-sh compile config.guess config.sub" @@ -3870,9 +3948,187 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + + + + +echo 'tldbg:KPSE_SETUP called (toplevel=../)' >&5 # Check whether --enable-all-pkgs was given. if test ${enable_all_pkgs+y} then : @@ -3983,6 +4239,24 @@ fi + +# We must enable system extensions before any compiler call to avoid +# (valid) autoconf warnings. Because different configure.ac's use +# different kpse setup routines, we call the ac_use_system_extensions +# macro both here and in kpse_basic (in kpse-common.m4). +# +# Fortunately, Autoconf defines the system_extensions macro to only have +# any effect once (with ac_defun_once), so it's harmless to call it +# multiple time. +# +# LuaTeX requires system extensions for socket support. Also, since +# SyncTeX, some libraries, and others unconditionally #define +# GNU_SOURCE, it seems more consistent to always use it. +# + + +# this macro, kpse_check_win32, is the first compiler call for +# configure.ac files that use this function (kpse setup). { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 printf %s "checking for native WIN32 or MINGW32... " >&6; } if test ${kpse_cv_have_win32+y} @@ -4035,6 +4309,8 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 printf "%s\n" "$kpse_cv_have_win32" >&6; } +# end call to kpse_check_win32. + case $with_x:$kpse_cv_have_win32 in #( yes:no | no:*) : : ;; #( @@ -6507,6 +6783,9 @@ fi +# end of kpse_setup macro. +echo 'tldbg:KPSE_SETUP done (toplevel=../)' >&5 + am__api_version='1.16' @@ -7084,6 +7363,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=libs, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -7340,6 +7621,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -7364,6 +7647,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -7397,6 +7685,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -7454,6 +7744,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=libs, amopt=)' >&5 + diff --git a/source/libs/gmp/config.h.in b/source/libs/gmp/config.h.in index 65c4d2871..21508000c 100644 --- a/source/libs/gmp/config.h.in +++ b/source/libs/gmp/config.h.in @@ -38,6 +38,9 @@ /* Define to 1 if you have the 'memset' function. */ #undef HAVE_MEMSET +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'raise' function. */ #undef HAVE_RAISE @@ -68,6 +71,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -112,6 +118,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/gmp/configure b/source/libs/gmp/configure index 861cad486..381435a5d 100755 --- a/source/libs/gmp/configure +++ b/source/libs/gmp/configure @@ -1544,6 +1544,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1715,41 +1750,6 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_try_run LINENO # ---------------------- # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that @@ -2283,6 +2283,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2608,7 +2609,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2617,6 +2617,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub compile missing install-sh" @@ -4569,6 +4571,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4589,6 +4768,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=gmp, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4715,6 +4896,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4739,6 +4922,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4772,6 +4960,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4829,6 +5019,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=gmp, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6215,35 +6408,6 @@ printf "%s\n" "#define HAVE_ATTRIBUTE_NORETURN 1" >>confdefs.h fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" if test "x$ac_cv_type_long_long" = xyes then : diff --git a/source/libs/gmp/native/config.h.in b/source/libs/gmp/native/config.h.in index dd3b02c5f..2c434ef27 100644 --- a/source/libs/gmp/native/config.h.in +++ b/source/libs/gmp/native/config.h.in @@ -1,5 +1,38 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -21,5 +54,102 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#undef STDC_HEADERS + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/gmp/native/configure b/source/libs/gmp/native/configure index da5c299d2..8881e53c7 100755 --- a/source/libs/gmp/native/configure +++ b/source/libs/gmp/native/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="../gmp-src/gmp-impl.h" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1488,6 +1520,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1830,6 +1897,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2155,6 +2223,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="compile missing install-sh" @@ -4107,6 +4185,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4127,6 +4382,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=gmp native, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4253,6 +4510,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4277,6 +4536,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4310,6 +4574,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4367,6 +4633,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=gmp native, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/source/libs/icu/configure b/source/libs/icu/configure index 79d025bf9..a486f96c9 100755 --- a/source/libs/icu/configure +++ b/source/libs/icu/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="icu-src/source/common/unicode/utypes.h" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1518,6 +1550,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1900,6 +1967,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2225,6 +2293,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Test code for whether the C++ compiler supports C++98 (global declarations) ac_cxx_conftest_cxx98_globals=' // Does the compiler advertise C++98 conformance? @@ -4393,6 +4471,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4413,6 +4668,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=icu, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4539,6 +4796,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4563,6 +4822,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4596,6 +4860,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4653,6 +4919,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=icu, amopt=)' >&5 + diff --git a/source/libs/libpaper/configure b/source/libs/libpaper/configure index 8561c0d63..0f6d3a2d1 100755 --- a/source/libs/libpaper/configure +++ b/source/libs/libpaper/configure @@ -4258,6 +4258,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=paper, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4514,6 +4516,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4538,6 +4542,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4571,6 +4580,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4628,6 +4639,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=paper, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/source/libs/libpng/config.h.in b/source/libs/libpng/config.h.in index c82251cc5..873a63744 100644 --- a/source/libs/libpng/config.h.in +++ b/source/libs/libpng/config.h.in @@ -9,6 +9,9 @@ /* Define to 1 if you have the 'memset' function. */ #undef HAVE_MEMSET +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -33,6 +36,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -80,6 +86,98 @@ /* Define to 1 if your declares 'struct tm'. */ #undef TM_IN_SYS_TIME +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/libpng/configure b/source/libs/libpng/configure index 30fb8e637..a45f7a2f0 100755 --- a/source/libs/libpng/configure +++ b/source/libs/libpng/configure @@ -1586,6 +1586,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1634,41 +1669,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} 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 @@ -2130,6 +2130,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2455,7 +2456,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2464,6 +2464,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="ar-lib config.guess config.sub compile missing install-sh" @@ -4416,6 +4418,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4436,6 +4615,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=libpng, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4562,6 +4743,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4586,6 +4769,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4619,6 +4807,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4676,6 +4866,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=libpng, amopt=)' >&5 + # Because we use $host_cpu below. @@ -6253,35 +6446,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Checks for header files. # Autoupdate added the next two lines to ensure that your configure # script's behavior did not change. They are probably safe to remove. -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 printf %s "checking for grep that handles long lines and -e... " >&6; } if test ${ac_cv_path_GREP+y} diff --git a/source/libs/mpfi/configure b/source/libs/mpfi/configure index 4855156c1..e238080c1 100755 --- a/source/libs/mpfi/configure +++ b/source/libs/mpfi/configure @@ -1560,6 +1560,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1667,41 +1702,6 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2060,6 +2060,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2385,7 +2386,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2394,6 +2394,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub compile missing install-sh" @@ -4346,6 +4348,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4366,6 +4545,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=mpfi, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4492,6 +4673,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4516,6 +4699,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4549,6 +4737,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4606,6 +4796,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=mpfi, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5918,35 +6111,6 @@ ${top_builddir}/../../libs/mpfr/include/mpfr.h: fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi 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 : diff --git a/source/libs/mpfi/mpfi_config.h.in b/source/libs/mpfi/mpfi_config.h.in index 782e0f296..19fe714a6 100644 --- a/source/libs/mpfi/mpfi_config.h.in +++ b/source/libs/mpfi/mpfi_config.h.in @@ -9,6 +9,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mpfr_q_sub' function. */ #undef HAVE_MPFR_Q_SUB @@ -42,6 +45,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -68,6 +74,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/mpfr/config.h.in b/source/libs/mpfr/config.h.in index 69583f448..975823024 100644 --- a/source/libs/mpfr/config.h.in +++ b/source/libs/mpfr/config.h.in @@ -31,6 +31,9 @@ /* Define if compiler supports long long */ #undef HAVE_LONG_LONG +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define if stdarg */ #undef HAVE_STDARG @@ -142,6 +145,98 @@ macro is obsolete. */ #undef TIME_WITH_SYS_TIME +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/mpfr/configure b/source/libs/mpfr/configure index e40002f47..3e8329a12 100755 --- a/source/libs/mpfr/configure +++ b/source/libs/mpfr/configure @@ -1551,6 +1551,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1599,41 +1634,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} 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 @@ -2149,6 +2149,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2474,7 +2475,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2483,6 +2483,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" # Auxiliary files required by this configure script. @@ -4436,6 +4438,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4456,6 +4635,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=mpfr, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4582,6 +4763,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4606,6 +4789,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4639,6 +4827,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4696,6 +4886,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=mpfr, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5910,35 +6103,6 @@ fi eval kpse_build_alias=\${build_alias-$build} -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi # Obsolete code to be removed. diff --git a/source/libs/pixman/config.h.in b/source/libs/pixman/config.h.in index 5dd805c49..b0ddcd137 100644 --- a/source/libs/pixman/config.h.in +++ b/source/libs/pixman/config.h.in @@ -15,6 +15,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -39,6 +42,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -104,6 +110,98 @@ /* use SSSE3 compiler intrinsics */ #undef USE_SSSE3 +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* use VMX compiler intrinsics */ #undef USE_VMX diff --git a/source/libs/pixman/configure b/source/libs/pixman/configure index 2270ba857..c0fd209a9 100755 --- a/source/libs/pixman/configure +++ b/source/libs/pixman/configure @@ -1528,6 +1528,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1684,41 +1719,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR # ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR @@ -2262,6 +2262,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2587,7 +2588,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2596,6 +2596,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="compile missing install-sh" @@ -4548,6 +4550,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4568,6 +4747,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=pixman, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4694,6 +4875,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4718,6 +4901,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4751,6 +4939,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4808,6 +4998,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=pixman, amopt=)' >&5 + PIXMAN_VERSION_MAJOR=0 PIXMAN_VERSION_MINOR=42 @@ -5882,35 +6075,6 @@ then : fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 printf %s "checking whether byte ordering is bigendian... " >&6; } if test ${ac_cv_c_bigendian+y} diff --git a/source/libs/pplib/config.h.in b/source/libs/pplib/config.h.in index d52b8d58b..a601d13a8 100644 --- a/source/libs/pplib/config.h.in +++ b/source/libs/pplib/config.h.in @@ -9,6 +9,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -33,6 +36,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -65,6 +71,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/pplib/configure b/source/libs/pplib/configure index b116df888..0abce3515 100755 --- a/source/libs/pplib/configure +++ b/source/libs/pplib/configure @@ -1614,6 +1614,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1662,41 +1697,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2294,6 +2294,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2619,7 +2620,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2628,6 +2628,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh compile missing install-sh" @@ -4580,6 +4582,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4600,6 +4779,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=pplib, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4726,6 +4907,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4750,6 +4933,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4783,6 +4971,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4840,6 +5030,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=pplib, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -9739,35 +9932,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes diff --git a/source/libs/zlib/config.h.in b/source/libs/zlib/config.h.in index fca272f5a..0db6ca54f 100644 --- a/source/libs/zlib/config.h.in +++ b/source/libs/zlib/config.h.in @@ -6,6 +6,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -30,6 +33,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -56,6 +62,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/libs/zlib/configure b/source/libs/zlib/configure index 6492ecf52..59ca0ecf6 100755 --- a/source/libs/zlib/configure +++ b/source/libs/zlib/configure @@ -1540,6 +1540,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1587,41 +1622,6 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile ac_configure_args_raw= for ac_arg do @@ -1917,6 +1917,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2242,7 +2243,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2251,6 +2251,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="ar-lib compile missing install-sh" @@ -4204,6 +4206,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4224,6 +4403,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=zlib, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4350,6 +4531,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4374,6 +4557,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4407,6 +4595,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4464,6 +4654,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=zlib, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5924,35 +6117,6 @@ else fi -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" if test "x$ac_cv_header_errno_h" = xyes then : diff --git a/source/texk/bibtex-x/config.h.in b/source/texk/bibtex-x/config.h.in index cb7c1fab5..a48707cde 100644 --- a/source/texk/bibtex-x/config.h.in +++ b/source/texk/bibtex-x/config.h.in @@ -44,6 +44,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -103,6 +106,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -132,6 +138,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/source/texk/bibtex-x/configure b/source/texk/bibtex-x/configure index 350a98a44..00b9d7052 100755 --- a/source/texk/bibtex-x/configure +++ b/source/texk/bibtex-x/configure @@ -1641,6 +1641,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1689,41 +1724,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2562,6 +2562,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2887,7 +2888,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2896,6 +2896,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Test code for whether the C++ compiler supports C++98 (global declarations) ac_cxx_conftest_cxx98_globals=' // Does the compiler advertise C++98 conformance? @@ -5064,6 +5066,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8923,35 +9102,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -9046,6 +9196,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=bibtex-x, amopt=no-define)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=bibtex-x, amopt=no-define)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9167,6 +9319,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9191,6 +9345,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9224,6 +9383,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9281,6 +9442,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=bibtex-x, amopt=no-define)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/configure b/source/texk/configure index 7c06943a2..09e0d2114 100755 --- a/source/texk/configure +++ b/source/texk/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-live@tug.org' PACKAGE_URL='' ac_unique_file="../build-aux/missing" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1854,6 +1886,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2196,6 +2263,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2521,6 +2589,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="missing install-sh compile config.guess config.sub" @@ -3870,9 +3948,187 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + + + + +echo 'tldbg:KPSE_SETUP called (toplevel=../)' >&5 # Check whether --enable-all-pkgs was given. if test ${enable_all_pkgs+y} then : @@ -3983,6 +4239,24 @@ fi + +# We must enable system extensions before any compiler call to avoid +# (valid) autoconf warnings. Because different configure.ac's use +# different kpse setup routines, we call the ac_use_system_extensions +# macro both here and in kpse_basic (in kpse-common.m4). +# +# Fortunately, Autoconf defines the system_extensions macro to only have +# any effect once (with ac_defun_once), so it's harmless to call it +# multiple time. +# +# LuaTeX requires system extensions for socket support. Also, since +# SyncTeX, some libraries, and others unconditionally #define +# GNU_SOURCE, it seems more consistent to always use it. +# + + +# this macro, kpse_check_win32, is the first compiler call for +# configure.ac files that use this function (kpse setup). { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 printf %s "checking for native WIN32 or MINGW32... " >&6; } if test ${kpse_cv_have_win32+y} @@ -4035,6 +4309,8 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 printf "%s\n" "$kpse_cv_have_win32" >&6; } +# end call to kpse_check_win32. + case $with_x:$kpse_cv_have_win32 in #( yes:no | no:*) : : ;; #( @@ -6507,6 +6783,9 @@ fi +# end of kpse_setup macro. +echo 'tldbg:KPSE_SETUP done (toplevel=../)' >&5 + am__api_version='1.16' @@ -7084,6 +7363,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=texk, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -7340,6 +7621,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -7364,6 +7647,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -7397,6 +7685,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -7454,6 +7744,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=texk, amopt=)' >&5 + diff --git a/source/texk/dvi2tty/c-auto.in b/source/texk/dvi2tty/c-auto.in index add1368c4..f1c83d514 100644 --- a/source/texk/dvi2tty/c-auto.in +++ b/source/texk/dvi2tty/c-auto.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -129,6 +135,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/dvi2tty/configure b/source/texk/dvi2tty/configure index 00174830f..b9c21ba79 100755 --- a/source/texk/dvi2tty/configure +++ b/source/texk/dvi2tty/configure @@ -1614,6 +1614,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1662,41 +1697,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2373,6 +2373,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2698,7 +2699,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2707,6 +2707,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4659,6 +4661,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8518,35 +8697,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8641,6 +8791,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=dvi2tty, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=dvi2tty, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8767,6 +8919,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8791,6 +8945,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8824,6 +8983,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8881,6 +9042,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dvi2tty, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/dvidvi/config.h.in b/source/texk/dvidvi/config.h.in index 0984450fe..a261194ea 100644 --- a/source/texk/dvidvi/config.h.in +++ b/source/texk/dvidvi/config.h.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -132,6 +138,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/dvidvi/configure b/source/texk/dvidvi/configure index 0ab2b4acb..7d72cdca1 100755 --- a/source/texk/dvidvi/configure +++ b/source/texk/dvidvi/configure @@ -1608,6 +1608,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1656,41 +1691,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2367,6 +2367,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2692,7 +2693,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2701,6 +2701,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4653,6 +4655,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8512,35 +8691,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8635,6 +8785,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=dvidvi, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=dvidvi, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8761,6 +8913,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8785,6 +8939,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8818,6 +8977,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8875,6 +9036,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dvidvi, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/dviout-util/config.h.in b/source/texk/dviout-util/config.h.in index 0984450fe..a261194ea 100644 --- a/source/texk/dviout-util/config.h.in +++ b/source/texk/dviout-util/config.h.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -132,6 +138,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/dviout-util/configure b/source/texk/dviout-util/configure index 78aeca926..8c583b478 100755 --- a/source/texk/dviout-util/configure +++ b/source/texk/dviout-util/configure @@ -1613,6 +1613,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1661,41 +1696,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2372,6 +2372,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2697,7 +2698,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2706,6 +2706,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4658,6 +4660,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8517,35 +8696,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8640,6 +8790,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=dviout-util, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=dviout-util, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8766,6 +8918,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8790,6 +8944,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8823,6 +8982,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8880,6 +9041,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dviout-util, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/dvipdfm-x/config.h.in b/source/texk/dvipdfm-x/config.h.in index 9e851b06a..5c5654189 100644 --- a/source/texk/dvipdfm-x/config.h.in +++ b/source/texk/dvipdfm-x/config.h.in @@ -63,6 +63,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -145,6 +148,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define if you have zlib and its headers. */ #undef HAVE_ZLIB @@ -195,6 +201,98 @@ /* Define to 1 if your declares 'struct tm'. */ #undef TM_IN_SYS_TIME +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/dvipdfm-x/configure b/source/texk/dvipdfm-x/configure index 44bb2d0c2..36ae87110 100755 --- a/source/texk/dvipdfm-x/configure +++ b/source/texk/dvipdfm-x/configure @@ -1640,6 +1640,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1688,41 +1723,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2638,6 +2638,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2963,7 +2964,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2972,6 +2972,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4924,6 +4926,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8783,35 +8962,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8906,6 +9056,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=dvipdfm-x, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=dvipdfm-x, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9032,6 +9184,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9056,6 +9210,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9089,6 +9248,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9146,6 +9307,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dvipdfm-x, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/dvipsk/c-auto.in b/source/texk/dvipsk/c-auto.in index 1bc7cf71f..b21e88a45 100644 --- a/source/texk/dvipsk/c-auto.in +++ b/source/texk/dvipsk/c-auto.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -135,6 +141,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/dvipsk/configure b/source/texk/dvipsk/configure index de070d73a..b564c759f 100755 --- a/source/texk/dvipsk/configure +++ b/source/texk/dvipsk/configure @@ -1609,6 +1609,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1657,41 +1692,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2607,6 +2607,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2932,7 +2933,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2941,6 +2941,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4894,6 +4896,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8753,35 +8932,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8876,6 +9026,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=dvipsk, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=dvipsk, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9002,6 +9154,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9026,6 +9180,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9059,6 +9218,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9116,6 +9277,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dvipsk, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/dvipsk/squeeze/configure b/source/texk/dvipsk/squeeze/configure index 01d430b0c..c14bbeced 100755 --- a/source/texk/dvipsk/squeeze/configure +++ b/source/texk/dvipsk/squeeze/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="squeeze.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1485,6 +1517,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1827,6 +1894,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2152,6 +2220,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="compile missing install-sh" @@ -4104,6 +4182,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -4124,6 +4379,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=dvipsk squeeze, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4250,6 +4507,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4274,6 +4533,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -4307,6 +4571,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -4364,6 +4630,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=dvipsk squeeze, amopt=)' >&5 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/source/texk/kpathsea/c-auto.in b/source/texk/kpathsea/c-auto.in index a96935b4f..ccf48a4a2 100644 --- a/source/texk/kpathsea/c-auto.in +++ b/source/texk/kpathsea/c-auto.in @@ -74,6 +74,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -133,6 +136,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -193,6 +199,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure index 0ae63f2bf..d7ee0f84a 100755 --- a/source/texk/kpathsea/configure +++ b/source/texk/kpathsea/configure @@ -1626,6 +1626,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1674,41 +1709,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2624,6 +2624,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2949,7 +2950,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2958,6 +2958,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4920,6 +4922,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8779,35 +8958,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8902,6 +9052,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=kpathsea, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=kpathsea, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9028,6 +9180,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9052,6 +9206,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9085,6 +9244,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9142,6 +9303,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=kpathsea, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/makejvf/c-auto.in b/source/texk/makejvf/c-auto.in index df6ab5eaf..21f767c2b 100644 --- a/source/texk/makejvf/c-auto.in +++ b/source/texk/makejvf/c-auto.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -126,6 +132,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/source/texk/makejvf/configure b/source/texk/makejvf/configure index 1e6ca7b61..8c530a81d 100755 --- a/source/texk/makejvf/configure +++ b/source/texk/makejvf/configure @@ -1610,6 +1610,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1658,41 +1693,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2369,6 +2369,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2694,7 +2695,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2703,6 +2703,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4655,6 +4657,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8514,35 +8693,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8637,6 +8787,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=makejvfk, amopt=no-define)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=makejvfk, amopt=no-define)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8758,6 +8910,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8782,6 +8936,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8815,6 +8974,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8872,6 +9033,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=makejvfk, amopt=no-define)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/mendexk/c-auto.in b/source/texk/mendexk/c-auto.in index 4cfcc5ad6..7fa3d62b9 100644 --- a/source/texk/mendexk/c-auto.in +++ b/source/texk/mendexk/c-auto.in @@ -41,6 +41,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -100,6 +103,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if you have C99 variadic macros. */ #undef HAVE___VA_ARGS__ @@ -132,6 +138,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/source/texk/mendexk/configure b/source/texk/mendexk/configure index d334c711d..843cd6bbc 100755 --- a/source/texk/mendexk/configure +++ b/source/texk/mendexk/configure @@ -1610,6 +1610,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1658,41 +1693,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2369,6 +2369,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2694,7 +2695,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2703,6 +2703,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4655,6 +4657,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8514,35 +8693,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8637,6 +8787,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=mendexk, amopt=no-define)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=mendexk, amopt=no-define)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8758,6 +8910,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8782,6 +8936,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8815,6 +8974,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8872,6 +9033,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=mendexk, amopt=no-define)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/ptexenc/c-auto.in b/source/texk/ptexenc/c-auto.in index dd8ea6dd1..a2b69599a 100644 --- a/source/texk/ptexenc/c-auto.in +++ b/source/texk/ptexenc/c-auto.in @@ -61,6 +61,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -123,6 +126,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if you use iconv for kanji <=> unicode conversion. */ #undef KANJI_ICONV @@ -158,6 +164,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/ptexenc/configure b/source/texk/ptexenc/configure index ccfbd18eb..ae23bc745 100755 --- a/source/texk/ptexenc/configure +++ b/source/texk/ptexenc/configure @@ -1609,6 +1609,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1657,41 +1692,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2368,6 +2368,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2693,7 +2694,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2702,6 +2702,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4660,6 +4662,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8519,35 +8698,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8642,6 +8792,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=ptexenc, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=ptexenc, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8768,6 +8920,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8792,6 +8946,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8825,6 +8984,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8882,6 +9043,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=ptexenc, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/seetexk/config.h.in b/source/texk/seetexk/config.h.in index e678a160a..0106b69f7 100644 --- a/source/texk/seetexk/config.h.in +++ b/source/texk/seetexk/config.h.in @@ -44,6 +44,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -106,6 +109,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -138,6 +144,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/seetexk/configure b/source/texk/seetexk/configure index 530d69898..afb4bccfb 100755 --- a/source/texk/seetexk/configure +++ b/source/texk/seetexk/configure @@ -1606,6 +1606,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1654,41 +1689,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2365,6 +2365,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2690,7 +2691,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2699,6 +2699,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4651,6 +4653,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8510,35 +8689,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8633,6 +8783,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=seetexk, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=seetexk, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -8759,6 +8911,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -8783,6 +8937,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -8816,6 +8975,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -8873,6 +9034,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=seetexk, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/upmendex/c-auto.in b/source/texk/upmendex/c-auto.in index d352d04df..85b76d9ba 100644 --- a/source/texk/upmendex/c-auto.in +++ b/source/texk/upmendex/c-auto.in @@ -44,6 +44,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -103,6 +106,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if you have C99 variadic macros. */ #undef HAVE___VA_ARGS__ @@ -135,6 +141,98 @@ /* Define to the current TeX Live version string. */ #undef TL_VERSION +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/source/texk/upmendex/configure b/source/texk/upmendex/configure index 955360c82..136902fe0 100755 --- a/source/texk/upmendex/configure +++ b/source/texk/upmendex/configure @@ -1630,6 +1630,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1678,41 +1713,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2551,6 +2551,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2876,7 +2877,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2885,6 +2885,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Test code for whether the C++ compiler supports C++98 (global declarations) ac_cxx_conftest_cxx98_globals=' // Does the compiler advertise C++98 conformance? @@ -5053,6 +5055,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8912,35 +9091,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -9035,6 +9185,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=upmendex, amopt=no-define)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=upmendex, amopt=no-define)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9156,6 +9308,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9180,6 +9334,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9213,6 +9372,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9270,6 +9431,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=upmendex, amopt=no-define)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog index 96014fdc2..e5d85a5f2 100644 --- a/source/texk/web2c/ChangeLog +++ b/source/texk/web2c/ChangeLog @@ -1,3 +1,19 @@ +2024-04-28 Luigi Scarso + + * configure.ac (LUA53_DEFINES, LUA52_DEFINES, LUAJIT_DEFINES): + define _LARGEFILE_SOURCE to help avoid off64_t errors. Specifically: + +In file included from /home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/types.h:25, + from /home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/zzip.h:17, + from ../../../texk/web2c/luatexdir/luazip/src/luazip.c:13: +/home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/conf.h:50:23: error: unknown type name 'off64_t' + #define _zzip_off64_t off64_t + ^~~~~~~ +/home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/types.h:35:15: note: in expansion of macro '_zzip_off64_t' + typedef _zzip_off64_t zzip_off64_t; + ^~~~~~~~~~~~~ +make[5]: *** [Makefile:10380: luatexdir/luazip/src/libluajitmisc_a-luazip.o] Error 1 + 2024-04-21 Karl Berry * configure.ac (AC_USE_SYSTEM_EXTENSIONS): make it unconditional, diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 1e42d352a..98813e302 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -342,6 +342,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -4674,7 +4675,7 @@ libluasocket_a_CPPFLAGS = \ #liblua53socket_a_CPPFLAGS = \ # -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_LUA53_INCLUDES) libluajitsocket_a_CPPFLAGS = \ - -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES) + -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) libluajitsocket_a_CFLAGS = # $(WARNING_CFLAGS) @@ -4720,8 +4721,8 @@ libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES) #liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \ - $(PPLIB_INCLUDES) $(LUAJIT_INCLUDES) -DLuajitTeX \ - -I$(srcdir)/luatexdir + $(PPLIB_INCLUDES) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) \ + -DLuajitTeX -I$(srcdir)/luatexdir libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) #liblua53misc_a_CFLAGS = # $(WARNING_CFLAGS) libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS) @@ -5275,7 +5276,8 @@ libluaharfbuzz_a_DEPENDENCIES = $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) libluajitharfbuzz_a_DEPENDENCIES = $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) libluaharfbuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES) libluajitharfbuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) \ - $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES) -DLuajitTeX + $(LUAJIT_DEFINES) $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES) \ + -DLuajitTeX libluaharfbuzz_a_CFLAGS = # $(WARNING_CFLAGS) libluajitharfbuzz_a_CFLAGS = # $(WARNING_CFLAGS) libluaharfbuzz_a_SOURCES = \ diff --git a/source/texk/web2c/aclocal.m4 b/source/texk/web2c/aclocal.m4 index daa8e104e..ff7bd5d4a 100644 --- a/source/texk/web2c/aclocal.m4 +++ b/source/texk/web2c/aclocal.m4 @@ -1295,6 +1295,7 @@ m4_include([../../m4/kpse-graphite2-flags.m4]) m4_include([../../m4/kpse-harfbuzz-flags.m4]) m4_include([../../m4/kpse-icu-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) +m4_include([../../m4/kpse-largefile.m4]) m4_include([../../m4/kpse-lex.m4]) m4_include([../../m4/kpse-lib-version.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure index 0ea00d051..62ffd4c22 100755 --- a/source/texk/web2c/configure +++ b/source/texk/web2c/configure @@ -9779,6 +9779,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=web2c programs, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=web2c programs, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -10035,6 +10037,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -10059,6 +10063,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -10092,6 +10101,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -10149,6 +10160,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=web2c programs, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then @@ -22424,6 +22438,72 @@ case $host_os:$host_cpu in #( esac +if test "x$enable_largefile" != xno; then + case $ac_cv_sys_file_offset_bits in #( + no) : + ;; #( + unknown) : + case $ac_cv_sys_large_files in #( + no | unknown) : + ;; #( + *) : + LUA53_DEFINES="$LUA53_DEFINES -D_LARGE_FILES" ;; +esac ;; #( + *) : + LUA53_DEFINES="$LUA53_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;; +esac +fi +case $ac_cv_sys_largefile_source in #( + no | unknown) : + ;; #( + *) : + LUA53_DEFINES="$LUA53_DEFINES -D_LARGEFILE_SOURCE" ;; +esac + +if test "x$enable_largefile" != xno; then + case $ac_cv_sys_file_offset_bits in #( + no) : + ;; #( + unknown) : + case $ac_cv_sys_large_files in #( + no | unknown) : + ;; #( + *) : + LUA52_DEFINES="$LUA52_DEFINES -D_LARGE_FILES" ;; +esac ;; #( + *) : + LUA52_DEFINES="$LUA52_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;; +esac +fi +case $ac_cv_sys_largefile_source in #( + no | unknown) : + ;; #( + *) : + LUA52_DEFINES="$LUA52_DEFINES -D_LARGEFILE_SOURCE" ;; +esac + +if test "x$enable_largefile" != xno; then + case $ac_cv_sys_file_offset_bits in #( + no) : + ;; #( + unknown) : + case $ac_cv_sys_large_files in #( + no | unknown) : + ;; #( + *) : + LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGE_FILES" ;; +esac ;; #( + *) : + LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;; +esac +fi +case $ac_cv_sys_largefile_source in #( + no | unknown) : + ;; #( + *) : + LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGEFILE_SOURCE" ;; +esac + LIBS=$kpse_save_LIBS if test "x$kpse_cv_have_win32" = xno; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 diff --git a/source/texk/web2c/configure.ac b/source/texk/web2c/configure.ac index 2f3fb5790..44f6a5c3e 100644 --- a/source/texk/web2c/configure.ac +++ b/source/texk/web2c/configure.ac @@ -116,6 +116,9 @@ kpse_save_LIBS=$LIBS KPSE_LUA53_DEFINES KPSE_LUA52_DEFINES KPSE_LUAJIT_DEFINES +KPSE_LARGEFILE([LUA53_DEFINES], [_LARGEFILE64_SOURCE]) +KPSE_LARGEFILE([LUA52_DEFINES], [_LARGEFILE64_SOURCE]) +KPSE_LARGEFILE([LUAJIT_DEFINES], [_LARGEFILE64_SOURCE]) LIBS=$kpse_save_LIBS if test "x$kpse_cv_have_win32" = xno; then AC_SEARCH_LIBS([gethostbyname], [nsl]) diff --git a/source/texk/web2c/doc/Makefile.in b/source/texk/web2c/doc/Makefile.in index b9dc2c05b..5ee392343 100644 --- a/source/texk/web2c/doc/Makefile.in +++ b/source/texk/web2c/doc/Makefile.in @@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in index 435bdd73a..254949ce6 100644 --- a/source/texk/web2c/lib/Makefile.in +++ b/source/texk/web2c/lib/Makefile.in @@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in index 7bfb6cfa2..f3b326370 100644 --- a/source/texk/web2c/man/Makefile.in +++ b/source/texk/web2c/man/Makefile.in @@ -128,6 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/omegafonts/Makefile.in b/source/texk/web2c/omegafonts/Makefile.in index 6a0c33558..99e5f6328 100644 --- a/source/texk/web2c/omegafonts/Makefile.in +++ b/source/texk/web2c/omegafonts/Makefile.in @@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/otps/Makefile.in b/source/texk/web2c/otps/Makefile.in index 9d146d114..281a16c93 100644 --- a/source/texk/web2c/otps/Makefile.in +++ b/source/texk/web2c/otps/Makefile.in @@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/otps/win32/Makefile.in b/source/texk/web2c/otps/win32/Makefile.in index d99449f2f..5357dbf56 100644 --- a/source/texk/web2c/otps/win32/Makefile.in +++ b/source/texk/web2c/otps/win32/Makefile.in @@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ diff --git a/source/texk/web2c/web2c/c-auto.in b/source/texk/web2c/web2c/c-auto.in index b27f89314..0752de715 100644 --- a/source/texk/web2c/web2c/c-auto.in +++ b/source/texk/web2c/web2c/c-auto.in @@ -44,6 +44,9 @@ /* Define to 1 if you have the 'memcpy' function. */ #undef HAVE_MEMCPY +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H + /* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP @@ -109,6 +112,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR @@ -147,6 +153,98 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif + + /* Version number of package */ #undef VERSION diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure index 4e9e7fc11..0d160e716 100755 --- a/source/texk/web2c/web2c/configure +++ b/source/texk/web2c/web2c/configure @@ -1610,6 +1610,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -1658,41 +1693,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2608,6 +2608,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2933,7 +2934,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -2942,6 +2942,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh" @@ -4894,6 +4896,183 @@ fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + # Check whether --enable-compiler-warnings was given. if test ${enable_compiler_warnings+y} then : @@ -8753,35 +8932,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -8876,6 +9026,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=web2c convert, amopt=)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=web2c convert, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -9002,6 +9154,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -9026,6 +9180,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -9059,6 +9218,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -9116,6 +9277,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=web2c convert, amopt=)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/texk/web2c/window/Makefile.in b/source/texk/web2c/window/Makefile.in index 688ef0086..f8fcee2c5 100644 --- a/source/texk/web2c/window/Makefile.in +++ b/source/texk/web2c/window/Makefile.in @@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ From 300e2c37fee33e125c4b01edcfc8a56a76d632c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Apr 2024 16:42:22 +0000 Subject: [PATCH 08/20] AC_USE_SYSTEM_EXTENSIONS globally git-svn-id: svn://tug.org/texlive/trunk/Build@71106 c570f23f-e606-0410-a88d-b1316a301751 --- source/m4/ChangeLog | 4 ++++ source/m4/kpse-common.m4 | 23 ++++++++++++++++------- source/m4/kpse-setup.m4 | 24 ++++++++++++++++++++++++ source/reautoconf | 1 + 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog index e8251fb4e..9573af778 100644 --- a/source/m4/ChangeLog +++ b/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2024-04-28 Karl Berry + + * kpse-common.m4 (KPSE_BASIC): + 2024-04-18 Karl Berry * kpse-visibility.m4 (_KPSE_VISIBILITY_FLAGS): avoid testing or diff --git a/source/m4/kpse-common.m4 b/source/m4/kpse-common.m4 index 491c648c5..f8706be25 100644 --- a/source/m4/kpse-common.m4 +++ b/source/m4/kpse-common.m4 @@ -1,6 +1,6 @@ # $Id$ # Public macros for the TeX Live (TL) tree. -# Copyright 1995-2009, 2015-2023 Karl Berry +# Copyright 1995-2009, 2015-2024 Karl Berry # Copyright 2009-2015 Peter Breitenlohner # # This file is free software; the copyright holders @@ -217,23 +217,32 @@ eval LIBS=\"$[]AS_TR_CPP($1)_LIBS \$LIBS\" AC_DEFUN([KPSE_BASIC], [dnl echo 'tldbg:[$0] called (pkg=[$1], amopt=[$2])' >&AS_MESSAGE_LOG_FD m4_define([Kpse_Package], [$1]) -dnl +# +# am_init_automake AM_INIT_AUTOMAKE([foreign silent-rules subdir-objects]m4_ifval([$2], [ $2])) + +# am_maintainer_mode AM_MAINTAINER_MODE -dnl -dnl Check whether prototypes work. + +# See comments in kpse-setup.m4 about system extensions. +AC_USE_SYSTEM_EXTENSIONS + +# Check whether prototypes work. AC_CACHE_CHECK([whether the compiler accepts prototypes], [kb_cv_c_prototypes], [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[extern void foo(int i,...);]])], + [[extern void foo(int i,...);]])], [kb_cv_c_prototypes=yes], [kb_cv_c_prototypes=no])]) if test "x$kb_cv_c_prototypes" = xno; then AC_MSG_ERROR([Sorry, your compiler does not understand prototypes.]) fi -dnl -dnl Enable flags for compiler warnings + +# kpse_compiler_warnings options. KPSE_COMPILER_WARNINGS + +# end of kpse_basic macro. +echo 'tldbg:[$0] done (pkg=[$1], amopt=[$2])' >&AS_MESSAGE_LOG_FD ]) # KPSE_BASIC # KPSE_COMMON(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS]) diff --git a/source/m4/kpse-setup.m4 b/source/m4/kpse-setup.m4 index 8da68c573..7a1844d80 100644 --- a/source/m4/kpse-setup.m4 +++ b/source/m4/kpse-setup.m4 @@ -18,6 +18,7 @@ # additional program specific configure options (if any) # library dependencies for programs and libraries AC_DEFUN([KPSE_SETUP], [dnl +echo 'tldbg:[$0] called (toplevel=[$1])' >&AS_MESSAGE_LOG_FD AC_REQUIRE([AC_CANONICAL_HOST])[]dnl AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl m4_define([kpse_TL], [$1])[]dnl @@ -74,7 +75,27 @@ KPSE_ENABLE_LT_HACK KPSE_LIBS_PREPARE KPSE_MKTEX_PREPARE KPSE_WEB2C_PREPARE + +# We must enable system extensions before any compiler call to avoid +# (valid) autoconf warnings. Because different configure.ac's use +# different kpse setup routines, we call the ac_use_system_extensions +# macro both here and in kpse_basic (in kpse-common.m4). +# +# Fortunately, Autoconf defines the system_extensions macro to only have +# any effect once (with ac_defun_once), so it's harmless to call it +# multiple time. +# +# LuaTeX requires system extensions for socket support. Also, since +# SyncTeX, some libraries, and others unconditionally #define +# GNU_SOURCE, it seems more consistent to always use it. +# +AC_USE_SYSTEM_EXTENSIONS + +# this macro, kpse_check_win32, is the first compiler call for +# configure.ac files that use this function (kpse setup). KPSE_CHECK_WIN32 +# end call to kpse_check_win32. + AS_CASE([$with_x:$kpse_cv_have_win32], [yes:no | no:*], [:], [yes:*], [AC_MSG_ERROR([you can not use `--with-x' for Windows])], @@ -96,6 +117,9 @@ KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])] KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])]) KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])]) KPSE_FOR_PKGS([texlibs], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])]) + +# end of kpse_setup macro. +echo 'tldbg:[$0] done (toplevel=[$1])' >&AS_MESSAGE_LOG_FD ]) # KPSE_SETUP # KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT]) diff --git a/source/reautoconf b/source/reautoconf index 6282ff55b..971132623 100755 --- a/source/reautoconf +++ b/source/reautoconf @@ -97,6 +97,7 @@ do_it () { $do_cmd "$@" if test $? -ne 0; then echo "$0: goodbye, exit status of $*: $?" >&2 + echo "$0: directory: `/bin/pwd`" >&2 exit 1 fi } From 3a05cdf5a9d574d3a368feda756c513d0bcc9ffd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Apr 2024 16:42:32 +0000 Subject: [PATCH 09/20] reautoconf git-svn-id: svn://tug.org/texlive/trunk/Build@71107 c570f23f-e606-0410-a88d-b1316a301751 --- source/configure | 318 ++++++++++++++++++++++++++++++++--------- source/utils/configure | 293 +++++++++++++++++++++++++++++++++++++ 2 files changed, 546 insertions(+), 65 deletions(-) diff --git a/source/configure b/source/configure index 596d7e726..284c1c740 100755 --- a/source/configure +++ b/source/configure @@ -1990,6 +1990,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2038,41 +2073,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2915,6 +2915,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -3240,7 +3241,6 @@ main (int argc, char **argv) } " -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" @@ -3249,6 +3249,8 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Test code for whether the C++ compiler supports C++98 (global declarations) ac_cxx_conftest_cxx98_globals=' // Does the compiler advertise C++98 conformance? @@ -4822,9 +4824,187 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + + + + +echo 'tldbg:KPSE_SETUP called (toplevel=)' >&5 # Check whether --enable-all-pkgs was given. if test ${enable_all_pkgs+y} then : @@ -4935,6 +5115,24 @@ fi + +# We must enable system extensions before any compiler call to avoid +# (valid) autoconf warnings. Because different configure.ac's use +# different kpse setup routines, we call the ac_use_system_extensions +# macro both here and in kpse_basic (in kpse-common.m4). +# +# Fortunately, Autoconf defines the system_extensions macro to only have +# any effect once (with ac_defun_once), so it's harmless to call it +# multiple time. +# +# LuaTeX requires system extensions for socket support. Also, since +# SyncTeX, some libraries, and others unconditionally #define +# GNU_SOURCE, it seems more consistent to always use it. +# + + +# this macro, kpse_check_win32, is the first compiler call for +# configure.ac files that use this function (kpse setup). { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 printf %s "checking for native WIN32 or MINGW32... " >&6; } if test ${kpse_cv_have_win32+y} @@ -4987,6 +5185,8 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 printf "%s\n" "$kpse_cv_have_win32" >&6; } +# end call to kpse_check_win32. + case $with_x:$kpse_cv_have_win32 in #( yes:no | no:*) : : ;; #( @@ -7649,6 +7849,9 @@ fi +# end of kpse_setup macro. +echo 'tldbg:KPSE_SETUP done (toplevel=)' >&5 + am__api_version='1.16' @@ -11988,35 +12191,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -12111,6 +12285,8 @@ esac echo 'tldbg:KPSE_COMMON called (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5 echo 'tldbg:KPSE_BASIC called (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -12454,6 +12630,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -12478,6 +12656,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -12511,6 +12694,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -12568,6 +12753,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5 + # am_prog_ar must be called before lt_init. if test -n "$ac_tool_prefix"; then diff --git a/source/utils/configure b/source/utils/configure index aa3a824aa..1e5c677c5 100755 --- a/source/utils/configure +++ b/source/utils/configure @@ -609,6 +609,38 @@ PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' ac_unique_file="../build-aux/missing" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_STDIO_H +# include +#endif +#ifdef HAVE_STDLIB_H +# include +#endif +#ifdef HAVE_STRING_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1854,6 +1886,41 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else case e in #( + e) eval "$3=no" ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2196,6 +2263,7 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -2521,6 +2589,16 @@ main (int argc, char **argv) } " +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" # Auxiliary files required by this configure script. ac_aux_files="missing install-sh compile config.guess config.sub" @@ -3870,9 +3948,187 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else case e in #( + e) MINIX= ;; +esac +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi + + + + +echo 'tldbg:KPSE_SETUP called (toplevel=../)' >&5 # Check whether --enable-all-pkgs was given. if test ${enable_all_pkgs+y} then : @@ -3983,6 +4239,24 @@ fi + +# We must enable system extensions before any compiler call to avoid +# (valid) autoconf warnings. Because different configure.ac's use +# different kpse setup routines, we call the ac_use_system_extensions +# macro both here and in kpse_basic (in kpse-common.m4). +# +# Fortunately, Autoconf defines the system_extensions macro to only have +# any effect once (with ac_defun_once), so it's harmless to call it +# multiple time. +# +# LuaTeX requires system extensions for socket support. Also, since +# SyncTeX, some libraries, and others unconditionally #define +# GNU_SOURCE, it seems more consistent to always use it. +# + + +# this macro, kpse_check_win32, is the first compiler call for +# configure.ac files that use this function (kpse setup). { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 printf %s "checking for native WIN32 or MINGW32... " >&6; } if test ${kpse_cv_have_win32+y} @@ -4035,6 +4309,8 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 printf "%s\n" "$kpse_cv_have_win32" >&6; } +# end call to kpse_check_win32. + case $with_x:$kpse_cv_have_win32 in #( yes:no | no:*) : : ;; #( @@ -6507,6 +6783,9 @@ fi +# end of kpse_setup macro. +echo 'tldbg:KPSE_SETUP done (toplevel=../)' >&5 + am__api_version='1.16' @@ -7084,6 +7363,8 @@ esac echo 'tldbg:KPSE_BASIC called (pkg=utils, amopt=)' >&5 +# +# am_init_automake if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -7340,6 +7621,8 @@ END fi +# am_maintainer_mode + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -7364,6 +7647,11 @@ fi MAINT=$MAINTAINER_MODE_TRUE + +# See comments in kpse-setup.m4 about system extensions. + + +# Check whether prototypes work. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5 printf %s "checking whether the compiler accepts prototypes... " >&6; } if test ${kb_cv_c_prototypes+y} @@ -7397,6 +7685,8 @@ printf "%s\n" "$kb_cv_c_prototypes" >&6; } if test "x$kb_cv_c_prototypes" = xno; then as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5 fi + +# kpse_compiler_warnings options. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 printf %s "checking what warning flags to pass to the C compiler... " >&6; } if test ${kpse_cv_warning_cflags+y} @@ -7454,6 +7744,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags +# end of kpse_basic macro. +echo 'tldbg:KPSE_BASIC done (pkg=utils, amopt=)' >&5 + From e7addc1de07aa25dbb2ee84ec1f308da0e60bc4a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Apr 2024 20:06:53 +0000 Subject: [PATCH 10/20] latexindent (28apr24) git-svn-id: svn://tug.org/texlive/trunk/Build@71114 c570f23f-e606-0410-a88d-b1316a301751 From d30d71e1cb2021f762df64935c4ac1a57ad32fee Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 29 Apr 2024 07:41:24 +0000 Subject: [PATCH 11/20] dvipdfm-x: Fix segfaults git-svn-id: svn://tug.org/texlive/trunk/Build@71116 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/dvipdfm-x/ChangeLog | 8 ++++++++ source/texk/dvipdfm-x/configure | 22 +++++++++++----------- source/texk/dvipdfm-x/configure.ac | 2 +- source/texk/dvipdfm-x/dvipdfmx-upjf2.test | 2 +- source/texk/dvipdfm-x/tests/UPJF-UTF16-H | 6 +++++- source/texk/dvipdfm-x/tests/UPJF-UTF16-V | 6 +++++- source/texk/dvipdfm-x/tests/upjf-hara.map | 8 ++++---- source/texk/dvipdfm-x/tfm.c | 12 ++++++++++++ 8 files changed, 47 insertions(+), 19 deletions(-) diff --git a/source/texk/dvipdfm-x/ChangeLog b/source/texk/dvipdfm-x/ChangeLog index 8703afe73..3204d3243 100644 --- a/source/texk/dvipdfm-x/ChangeLog +++ b/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2024-04-29 TANAKA Takuji + + * tfm.c: Fix segfaults. + * dvipdfmx-upjf2.test, tests/UPJF-UTF16-{H,V}, + tests/upjf-hara.map: Update tests. + https://github.com/texjporg/tex-jp-build/issues/46 + * configure.ac: version 20240427. + 2024-04-27 TANAKA Takuji * tfm.{c,h}, vf.c: Support upTeX new encoding diff --git a/source/texk/dvipdfm-x/configure b/source/texk/dvipdfm-x/configure index 36ae87110..da957c5ac 100755 --- a/source/texk/dvipdfm-x/configure +++ b/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240427. +# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240429. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20240427' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20240427' +PACKAGE_VERSION='20240429' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20240429' PACKAGE_BUGREPORT='dvipdfmx@tug.org' PACKAGE_URL='' @@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures dvipdfm-x (TeX Live) 20240427 to adapt to many kinds of systems. +'configure' configures dvipdfm-x (TeX Live) 20240429 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240427:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240429:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20240427 +dvipdfm-x (TeX Live) configure 20240429 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2367,7 +2367,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dvipdfm-x (TeX Live) $as_me 20240427, which was +It was created by dvipdfm-x (TeX Live) $as_me 20240429, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -9080,7 +9080,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20240427' + VERSION='20240429' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -16159,7 +16159,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20240427 +dvipdfm-x (TeX Live) config.lt 20240429 configured by $0, generated by GNU Autoconf 2.72. Copyright (C) 2011 Free Software Foundation, Inc. @@ -18102,7 +18102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dvipdfm-x (TeX Live) $as_me 20240427, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20240429, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18174,7 +18174,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20240427 +dvipdfm-x (TeX Live) config.status 20240429 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/source/texk/dvipdfm-x/configure.ac b/source/texk/dvipdfm-x/configure.ac index 87ddbc11d..4307906b5 100644 --- a/source/texk/dvipdfm-x/configure.ac +++ b/source/texk/dvipdfm-x/configure.ac @@ -8,7 +8,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dvipdfm-x (TeX Live)], [20240427], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20240429], [dvipdfmx@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test index cc5a49b9a..6c2229ec2 100755 --- a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test +++ b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test @@ -28,7 +28,7 @@ otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` export OPENTYPEFONTS -rm -f upjf.vf upjv.vf +rm -f upjf.vf upjv.vf upjf-r.ofm upjv-r.ofm echo "*** dvipdfmx: test for upjf2_full-hara.pdf" && echo \ && cp $srcdir/tests/upjf2_full.vf ./upjf.vf \ diff --git a/source/texk/dvipdfm-x/tests/UPJF-UTF16-H b/source/texk/dvipdfm-x/tests/UPJF-UTF16-H index a63768ab5..8bb6cda84 100644 --- a/source/texk/dvipdfm-x/tests/UPJF-UTF16-H +++ b/source/texk/dvipdfm-x/tests/UPJF-UTF16-H @@ -39,10 +39,14 @@ endcodespacerange <0000> <001f> 1 endnotdefrange -3 begincidchar +7 begincidchar +<31f7> 16243 +<537f> 1698 <6674> 2646 <96ea> 2695 + 636 13803 + 13719 endcidchar 14 begincidrange diff --git a/source/texk/dvipdfm-x/tests/UPJF-UTF16-V b/source/texk/dvipdfm-x/tests/UPJF-UTF16-V index 1365d9d5f..6ead17555 100644 --- a/source/texk/dvipdfm-x/tests/UPJF-UTF16-V +++ b/source/texk/dvipdfm-x/tests/UPJF-UTF16-V @@ -39,10 +39,14 @@ endcodespacerange <0000> <001f> 1 endnotdefrange -3 begincidchar +7 begincidchar +<31f7> 16340 +<537f> 1698 <6674> 2646 <96ea> 2695 + 8268 13803 + 13719 endcidchar 14 begincidrange diff --git a/source/texk/dvipdfm-x/tests/upjf-hara.map b/source/texk/dvipdfm-x/tests/upjf-hara.map index 578602dbc..f83c1a1ff 100644 --- a/source/texk/dvipdfm-x/tests/upjf-hara.map +++ b/source/texk/dvipdfm-x/tests/upjf-hara.map @@ -1,8 +1,8 @@ -upjf-r UniJIS-UTF16-H HaranoAjiMincho-Regular.otf -upjf-g UniJIS-UTF16-H HaranoAjiGothic-Regular.otf +upjf-r UPJF-UTF16-H HaranoAjiMincho-Regular.otf +upjf-g UPJF-UTF16-H HaranoAjiGothic-Regular.otf upjf-c Identity-H HaranoAjiMincho-Regular.otf -upjv-r UniJIS-UTF16-V HaranoAjiMincho-Regular.otf -upjv-g UniJIS-UTF16-V HaranoAjiGothic-Regular.otf +upjv-r UPJF-UTF16-V HaranoAjiMincho-Regular.otf +upjv-g UPJF-UTF16-V HaranoAjiGothic-Regular.otf upjv-c Identity-V HaranoAjiMincho-Regular.otf %upjf-r UniJIS-UTF16-H !Ryumin-Light diff --git a/source/texk/dvipdfm-x/tfm.c b/source/texk/dvipdfm-x/tfm.c index efc637083..ef092348a 100644 --- a/source/texk/dvipdfm-x/tfm.c +++ b/source/texk/dvipdfm-x/tfm.c @@ -1030,6 +1030,10 @@ tfm_get_fw_width (int font_id, int32_t ch) default: idx = ch; } +#ifndef WITHOUT_ASCII_PTEX + } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) { + idx = 0; +#endif /* !WITHOUT_ASCII_PTEX */ } else { ERROR("Invalid char: %ld\n", ch); } @@ -1061,6 +1065,10 @@ tfm_get_fw_height (int font_id, int32_t ch) default: idx = ch; } +#ifndef WITHOUT_ASCII_PTEX + } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) { + idx = 0; +#endif /* !WITHOUT_ASCII_PTEX */ } else { ERROR("Invalid char: %ld\n", ch); } @@ -1092,6 +1100,10 @@ tfm_get_fw_depth (int font_id, int32_t ch) default: idx = ch; } +#ifndef WITHOUT_ASCII_PTEX + } else if (ch > fm->lastchar && ch <= JFM_LASTCHAR) { + idx = 0; +#endif /* !WITHOUT_ASCII_PTEX */ } else { ERROR("Invalid char: %ld\n", ch); } From 990ef69f34c13a3670dd90ad9b39600b480233ac Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 29 Apr 2024 07:47:33 +0000 Subject: [PATCH 12/20] dvipdfm-x: ChangeLog git-svn-id: svn://tug.org/texlive/trunk/Build@71117 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/dvipdfm-x/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/texk/dvipdfm-x/ChangeLog b/source/texk/dvipdfm-x/ChangeLog index 3204d3243..55db019f5 100644 --- a/source/texk/dvipdfm-x/ChangeLog +++ b/source/texk/dvipdfm-x/ChangeLog @@ -4,7 +4,7 @@ * dvipdfmx-upjf2.test, tests/UPJF-UTF16-{H,V}, tests/upjf-hara.map: Update tests. https://github.com/texjporg/tex-jp-build/issues/46 - * configure.ac: version 20240427. + * configure.ac: version 20240429. 2024-04-27 TANAKA Takuji From 427683a8e0590ca45f97f2fdcaa0683ad504bfd1 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 29 Apr 2024 14:27:21 +0000 Subject: [PATCH 13/20] omegafonts: ver.2.2, Extend maximum character code git-svn-id: svn://tug.org/texlive/trunk/Build@71118 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/help.h | 3 + source/texk/web2c/omegafonts/ChangeLog | 13 ++ source/texk/web2c/omegafonts/Makefile.am | 5 +- source/texk/web2c/omegafonts/Makefile.in | 11 +- source/texk/web2c/omegafonts/char_routines.c | 8 +- source/texk/web2c/omegafonts/omfonts.c | 18 +-- source/texk/web2c/omegafonts/omfonts.h | 1 + source/texk/web2c/omegafonts/out_ofm.c | 1 + source/texk/web2c/omegafonts/overbmp.test | 24 ++++ source/texk/web2c/omegafonts/parse_ofm.c | 4 +- source/texk/web2c/omegafonts/tests/adbjpn.opl | 22 ++++ source/texk/web2c/omegafonts/tests/inbmp.opl | 12 ++ .../texk/web2c/omegafonts/tests/overbmp.opl | 6 + .../texk/web2c/omegafonts/tests/overbmp.ovp | 14 +++ .../texk/web2c/omegafonts/tests/overucs.opl | 46 ++++++++ .../texk/web2c/omegafonts/tests/overucs.ovp | 111 ++++++++++++++++++ 16 files changed, 279 insertions(+), 20 deletions(-) create mode 100644 source/texk/web2c/omegafonts/tests/adbjpn.opl create mode 100644 source/texk/web2c/omegafonts/tests/overucs.opl create mode 100644 source/texk/web2c/omegafonts/tests/overucs.ovp diff --git a/source/texk/web2c/help.h b/source/texk/web2c/help.h index 37f64b4e2..00737bb89 100644 --- a/source/texk/web2c/help.h +++ b/source/texk/web2c/help.h @@ -350,6 +350,9 @@ const_string OVP2OVFHELP[] = { " Default OVFFILE is basename of OVPFILE extended with `.ovf'.", " Default OFMFILE is basename of OVFFILE extended with `.ofm'.", "", +#ifdef OMFONTS + "-omit-ofm do not output OFMFILE", +#endif "-help display this help and exit", "-verbose display progress reports", "-version output version information and exit", diff --git a/source/texk/web2c/omegafonts/ChangeLog b/source/texk/web2c/omegafonts/ChangeLog index d7df7a08b..7ee9ac9b7 100644 --- a/source/texk/web2c/omegafonts/ChangeLog +++ b/source/texk/web2c/omegafonts/ChangeLog @@ -1,3 +1,16 @@ +2024-04-29 TANAKA Takuji + + * omfonts.{c,h}, out_ofm.c: + Add new option '-omit-ofm' for 'omfonts -ovp2ovf' + * parse_ofm.c, char_routines.c: + Extend maximum character code from 0x10FFFF to 0xFFFFFF + to support new encoding of upTeX for combining characters. + https://github.com/texjporg/tex-jp-build/issues/46 + * overbmp.test, tests/inbmp.opl, tests/over{bmp,ucs}.{opl,ovp}, + tests/adbjpn.opl, Makefile.am: Update tests. + + * omfonts.c: Version 2.2. + 2023-09-03 TANAKA Takuji * {check,repeat,selectfont}.test: Update tests for Windows. diff --git a/source/texk/web2c/omegafonts/Makefile.am b/source/texk/web2c/omegafonts/Makefile.am index b7bcd3878..f52580aa4 100644 --- a/source/texk/web2c/omegafonts/Makefile.am +++ b/source/texk/web2c/omegafonts/Makefile.am @@ -153,8 +153,9 @@ DISTCLEANFILES += tests/Cherokee.tfm tests/OCherokee.ofm \ tests/OCherokee.opl tests/OCherokee.ovf \ tests/xCherokee.* tests/xOCherokee.* ## overbmp.test -EXTRA_DIST += tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp -DISTCLEANFILES += tests/xinbmp* tests/xoverbmp* +EXTRA_DIST += tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp \ + tests/overucs.opl tests/overucs.ovp adbjpn.opl +DISTCLEANFILES += tests/xinbmp* tests/xoverbmp* tests/xoverucs* tests/xadbjpn* ## realnum.test EXTRA_DIST += tests/realnum.opl tests/realnum.out DISTCLEANFILES += tests/realnum.* diff --git a/source/texk/web2c/omegafonts/Makefile.in b/source/texk/web2c/omegafonts/Makefile.in index 99e5f6328..a63ee7d60 100644 --- a/source/texk/web2c/omegafonts/Makefile.in +++ b/source/texk/web2c/omegafonts/Makefile.in @@ -108,7 +108,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ - $(top_srcdir)/../../m4/kpse-largefile.m4 \ $(top_srcdir)/../../m4/kpse-lex.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -752,10 +751,11 @@ DISTCLEANFILES = pl-parser.output bad*.* tests/charwdr.* \ tests/xofont* tests/Cherokee.tfm tests/OCherokee.ofm \ tests/OCherokee.opl tests/OCherokee.ovf tests/xCherokee.* \ tests/xOCherokee.* tests/xinbmp* tests/xoverbmp* \ - tests/realnum.* tests/xrepeated.* tests/sample*.ofm \ - tests/sample*.ovf tests/sample1-h.opl tests/xsample*.out \ - tests/shortend.* tests/specialhex.ofm tests/specialhex.opl \ - tests/specialhex.ovf tests/xspecialhex.* tests/*yarabic* + tests/xoverucs* tests/xadbjpn* tests/realnum.* \ + tests/xrepeated.* tests/sample*.ofm tests/sample*.ovf \ + tests/sample1-h.opl tests/xsample*.out tests/shortend.* \ + tests/specialhex.ofm tests/specialhex.opl tests/specialhex.ovf \ + tests/xspecialhex.* tests/*yarabic* linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf bin_links = \ omfonts$(EXEEXT):ofm2opl \ @@ -782,6 +782,7 @@ EXTRA_DIST = $(OMFONTS_tests) tests/badofm.ofm tests/badopl.opl \ tests/ofontv5.opl tests/ofontv5.ovp tests/ofontv6.opl \ tests/ofontv6.ovp tests/Cherokee.pl tests/OCherokee.ovp \ tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp \ + tests/overucs.opl tests/overucs.ovp adbjpn.opl \ tests/realnum.opl tests/realnum.out tests/repeat.opl \ tests/repeated.opl tests/sample.out tests/sample.ovp \ tests/sample0-h.opl tests/shorten.opl tests/specialhex.ovp \ diff --git a/source/texk/web2c/omegafonts/char_routines.c b/source/texk/web2c/omegafonts/char_routines.c index 75d370f27..61f2fbe42 100644 --- a/source/texk/web2c/omegafonts/char_routines.c +++ b/source/texk/web2c/omegafonts/char_routines.c @@ -986,16 +986,16 @@ compute_ofm_character_info(void) break; } case OFM_LEVEL0: { - if (ec>0x10ffff) + if (ec>0xffffff) fatal_error_1( - "Char (%x) too big for OFM level-0 (max 10ffff); use level-2", + "Char (%x) too big for OFM level-0 (max ffffff); use level-2", ec); break; } case OFM_LEVEL1: { - if (ec>0x10ffff) + if (ec>0xffffff) fatal_error_1( - "Char (%x) too big for OFM level-1 (max 10ffff); use level-2", + "Char (%x) too big for OFM level-1 (max ffffff); use level-2", ec); num_char_info = 0; for (c = bc; c <= ec; c++) { diff --git a/source/texk/web2c/omegafonts/omfonts.c b/source/texk/web2c/omegafonts/omfonts.c index 7e8d4d2fa..9bd87d27b 100644 --- a/source/texk/web2c/omegafonts/omfonts.c +++ b/source/texk/web2c/omegafonts/omfonts.c @@ -54,6 +54,7 @@ int verbose_option; int char_format = CHAR_CODE_NUM; int num_format = NUM_CODE_HEX; int text_format = TEXT_CODE_MIXED; +int omit_ofm = 0; int program; @@ -91,11 +92,11 @@ static const_string names_program[PROG_NUM] = static const_string *names_help[PROG_NUM] = { OFM2OPLHELP, OPL2OFMHELP, OVF2OVPHELP, OVP2OVFHELP, OMFONTSHELP }; static const_string names_msg[PROG_NUM] = { - "This is ofm2opl, Version 2.1", - "This is opl2ofm, Version 2.1", - "This is ovf2ovp, Version 2.1", - "This is ovp2ovf, Version 2.1", - "This is omfonts, Version 2.1" + "This is ofm2opl, Version 2.2", + "This is opl2ofm, Version 2.2", + "This is ovf2ovp, Version 2.2", + "This is ovp2ovf, Version 2.2", + "This is omfonts, Version 2.2" }; int no_files=0; @@ -109,6 +110,7 @@ static struct option long_options[] = { {"num-format", 1, 0, 0}, {"charcode-format", 1, 0, 0}, {"text-format", 1, 0, 0}, + {"omit-ofm", 0, 0, 0}, {"ofm2opl", 0, 0, 0}, {"opl2ofm", 0, 0, 0}, {"ovf2ovp", 0, 0, 0}, @@ -163,6 +165,8 @@ main (int argc, string *argv) } else if (!strcmp(long_options[option_index ].name, "ovp2ovf")) { if (program == PROG_OMFONTS) program = PROG_OVP2OVF; else usage (names_program[program]); + } else if (!strcmp(long_options[option_index ].name, "omit-ofm")) { + omit_ofm = 1; } else if (!strcmp(long_options[option_index ].name, "char-format")) { if (!strcmp(optarg, "ascii")) char_format = CHAR_CODE_ASCII; else if (!strcmp(optarg, "num")) char_format = CHAR_CODE_NUM; @@ -313,12 +317,12 @@ main (int argc, string *argv) case PROG_OVP2OVF: { file_ovp = kpse_open_file(name_ovp, kpse_ovp_format); rewritebin(file_ovf, name_ovf); - rewritebin(file_ofm, name_ofm); + if (!omit_ofm) rewritebin(file_ofm, name_ofm); init_tables(); yyin = file_ovp; (void)yyparse(); output_ofm_file(); - (void)fclose(file_ofm); + if (!omit_ofm) (void)fclose(file_ofm); output_ovf_file(); (void)fclose(file_ovf); if (num_errors > 0) exit(1); diff --git a/source/texk/web2c/omegafonts/omfonts.h b/source/texk/web2c/omegafonts/omfonts.h index 6486c15c0..a22b95982 100644 --- a/source/texk/web2c/omegafonts/omfonts.h +++ b/source/texk/web2c/omegafonts/omfonts.h @@ -35,6 +35,7 @@ extern int verbose_option; extern int char_format; extern int num_format; extern int text_format; +extern int omit_ofm; extern unsigned length_ofm; extern unsigned length_ovf; diff --git a/source/texk/web2c/omegafonts/out_ofm.c b/source/texk/web2c/omegafonts/out_ofm.c index 0f8f515cd..bd7fbee2f 100644 --- a/source/texk/web2c/omegafonts/out_ofm.c +++ b/source/texk/web2c/omegafonts/out_ofm.c @@ -42,6 +42,7 @@ void output_ofm_file(void) { check_and_correct(); + if (omit_ofm) return; compute_ofm_extra_stuff(); compute_ofm_character_info(); compute_ofm_subsizes(); diff --git a/source/texk/web2c/omegafonts/overbmp.test b/source/texk/web2c/omegafonts/overbmp.test index 809e000be..97fef55b6 100755 --- a/source/texk/web2c/omegafonts/overbmp.test +++ b/source/texk/web2c/omegafonts/overbmp.test @@ -58,4 +58,28 @@ $_omfonts -ovf2ovp $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || rc=15 diff $tests/xoverbmp1.ovp $tests/xoverbmp2.ovp || rc=16 + +# +# JVF with characters of code points over UCS-range in upTeX encoding +# +$_omfonts -ovp2ovf $srcdir/$tests/overucs.ovp $tests/xoverucs || rc=21 + +$_omfonts -ovp2ovf -omit-ofm $srcdir/$tests/overucs.ovp $tests/xoverucs1 || rc=22 + +cmp $tests/xoverucs.ovf $tests/xoverucs1.ovf || rc=23 + +$_omfonts -ofm2opl xoverucs $tests/xoverucs || rc=24 + +diff $srcdir/$tests/overucs.opl $tests/xoverucs.opl || rc=25 + +$_omfonts -ovf2ovp $tests/xoverucs xoverucs $tests/xoverucs.ovp || rc=26 + +diff $srcdir/$tests/overucs.ovp $tests/xoverucs.ovp || rc=27 + +$_omfonts -opl2ofm $srcdir/$tests/adbjpn $tests/xadbjpn || rc=28 + +$_omfonts -ofm2opl xadbjpn $tests/xadbjpn || rc=29 + +diff $srcdir/$tests/adbjpn.opl $tests/xadbjpn.opl || rc=30 + exit $rc diff --git a/source/texk/web2c/omegafonts/parse_ofm.c b/source/texk/web2c/omegafonts/parse_ofm.c index 7aa0dadcc..6eaea0f20 100644 --- a/source/texk/web2c/omegafonts/parse_ofm.c +++ b/source/texk/web2c/omegafonts/parse_ofm.c @@ -187,14 +187,14 @@ ofm_organize(void) eval_four_bytes(&ec); eval_four_bytes(&nw); eval_four_bytes(&nh); - eval_four_bytes(&nd); + eval_four_bytes(&nd); eval_four_bytes(&ni); eval_four_bytes(&nl); eval_four_bytes(&nk); eval_four_bytes(&ne); eval_four_bytes(&np); eval_four_bytes(&font_dir); - top_char = 0x10ffff; + top_char = 0xffffff; top_width = 65535; top_height = 255; top_depth = 255; diff --git a/source/texk/web2c/omegafonts/tests/adbjpn.opl b/source/texk/web2c/omegafonts/tests/adbjpn.opl new file mode 100644 index 000000000..a39534262 --- /dev/null +++ b/source/texk/web2c/omegafonts/tests/adbjpn.opl @@ -0,0 +1,22 @@ +(OFMLEVEL H 0) +(FONTDIR TL) +(FAMILY UNSPECIFIED) +(FACE F MRR) +(CODINGSCHEME UNSPECIFIED) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM H 293701E9) +(SEVENBITSAFEFLAG FALSE) +(CHARACTER H 2079 + (CHARWD R 1.0) + ) +(CHARACTER H 3408 + (CHARWD R 1.0) + ) +(CHARACTER H 37CA + (CHARWD R 1.0) + ) +(CHARACTER H 3F51 + (CHARWD R 1.0) + ) diff --git a/source/texk/web2c/omegafonts/tests/inbmp.opl b/source/texk/web2c/omegafonts/tests/inbmp.opl index 7f23d0b82..a51e02055 100644 --- a/source/texk/web2c/omegafonts/tests/inbmp.opl +++ b/source/texk/web2c/omegafonts/tests/inbmp.opl @@ -8,9 +8,21 @@ (COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) (CHECKSUM H AA6297E0) (SEVENBITSAFEFLAG FALSE) +(CHARACTER H 304B + (CHARWD R 1.0) + ) (CHARACTER H 4E00 (CHARWD R 1.0) ) (CHARACTER H 53F1 (CHARWD R 1.0) ) +(CHARACTER H 9038 + (CHARWD R 1.0) + ) +(CHARACTER H FA25 + (CHARWD R 1.0) + ) +(CHARACTER H FA6C + (CHARWD R 1.0) + ) diff --git a/source/texk/web2c/omegafonts/tests/overbmp.opl b/source/texk/web2c/omegafonts/tests/overbmp.opl index c80f889b8..19eaf62f0 100644 --- a/source/texk/web2c/omegafonts/tests/overbmp.opl +++ b/source/texk/web2c/omegafonts/tests/overbmp.opl @@ -20,3 +20,9 @@ (CHARACTER H 20BB7 (CHARWD R 1.0) ) +(CHARACTER H 242EE + (CHARWD R 1.0) + ) +(CHARACTER H 2F9DE + (CHARWD R 1.0) + ) diff --git a/source/texk/web2c/omegafonts/tests/overbmp.ovp b/source/texk/web2c/omegafonts/tests/overbmp.ovp index 9110397b8..fa92efb43 100644 --- a/source/texk/web2c/omegafonts/tests/overbmp.ovp +++ b/source/texk/web2c/omegafonts/tests/overbmp.ovp @@ -47,3 +47,17 @@ (SETCHAR H 53F1) ) ) +(CHARACTER H 242EE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 1) + (SETCHAR H 242EE) + ) + ) +(CHARACTER H 2F9DE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 1) + (SETCHAR H 2F9DE) + ) + ) diff --git a/source/texk/web2c/omegafonts/tests/overucs.opl b/source/texk/web2c/omegafonts/tests/overucs.opl new file mode 100644 index 000000000..0a012d5ac --- /dev/null +++ b/source/texk/web2c/omegafonts/tests/overucs.opl @@ -0,0 +1,46 @@ +(OFMLEVEL H 1) +(FONTDIR TL) +(FAMILY UNSPECIFIED) +(FACE F MRR) +(CODINGSCHEME UNSPECIFIED) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM H DD8C3992) +(SEVENBITSAFEFLAG FALSE) +(CHARACTER H 304B + (CHARWD R 1.0) + ) +(CHARACTER H 30EF + (CHARWD R 1.0) + ) +(CHARACTER H 9038 + (CHARWD R 1.0) + ) +(CHARACTER H 242EE + (CHARWD R 1.0) + ) +(CHARACTER H 2230EF + (CHARWD R 1.0) + ) +(CHARACTER H 24304B + (CHARWD R 1.0) + ) +(CHARACTER H 408ED4 + (CHARWD R 1.0) + ) +(CHARACTER H 409038 + (CHARWD R 1.0) + ) +(CHARACTER H 4242EE + (CHARWD R 1.0) + ) +(CHARACTER H 8242EE + (CHARWD R 1.0) + ) +(CHARACTER H 849038 + (CHARWD R 1.0) + ) +(CHARACTER H 8642EE + (CHARWD R 1.0) + ) diff --git a/source/texk/web2c/omegafonts/tests/overucs.ovp b/source/texk/web2c/omegafonts/tests/overucs.ovp new file mode 100644 index 000000000..68c610347 --- /dev/null +++ b/source/texk/web2c/omegafonts/tests/overucs.ovp @@ -0,0 +1,111 @@ +(VTITLE JVF with characters of code points over UCS-range in upTeX encoding) +(OFMLEVEL H 1) +(FONTDIR TL) +(FAMILY UNSPECIFIED) +(FACE F MRR) +(CODINGSCHEME UNSPECIFIED) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM H DD8C3992) +(SEVENBITSAFEFLAG FALSE) +(MAPFONT D 0 + (FONTNAME xinbmp) + (FONTCHECKSUM H AA6297E0) + (FONTAT R 1.0) + (FONTDSIZE R 10.0) + ) +(MAPFONT D 1 + (FONTNAME xoverbmp) + (FONTCHECKSUM H DD8C3992) + (FONTAT R 1.0) + (FONTDSIZE R 10.0) + ) +(MAPFONT D 2 + (FONTNAME xadbjpn) + (FONTCHECKSUM H DD8C3992) + (FONTAT R 1.0) + (FONTDSIZE R 10.0) + ) +(CHARACTER H 304B + (CHARWD R 1.0) + (MAP + (SETCHAR H 304B) + ) + ) +(CHARACTER H 30EF + (CHARWD R 1.0) + (MAP + (SELECTFONT D 1) + (SETCHAR H 30EF) + ) + ) +(CHARACTER H 9038 + (CHARWD R 1.0) + (MAP + (SETCHAR H 9038) + ) + ) +(CHARACTER H 242EE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 1) + (SETCHAR H 242EE) + ) + ) +(CHARACTER H 2230EF + (CHARWD R 1.0) + (MAP + (SELECTFONT D 2) + (SETCHAR H 2079) + ) + ) +(CHARACTER H 24304B + (CHARWD R 1.0) + (MAP + (SELECTFONT D 2) + (SETCHAR H 3F51) + ) + ) +(CHARACTER H 408ED4 + (CHARWD R 1.0) + (MAP + (SELECTFONT D 1) + (SETCHAR H 2F9DE) + ) + ) +(CHARACTER H 409038 + (CHARWD R 1.0) + (MAP + (SELECTFONT D 0) + (SETCHAR H FA25) + ) + ) +(CHARACTER H 4242EE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 0) + (SETCHAR H FA6C) + ) + ) +(CHARACTER H 8242EE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 2) + (SETCHAR H 37CA) + ) + ) +(CHARACTER H 849038 + (CHARWD R 1.0) + (MAP + (SELECTFONT D 2) + (SETCHAR H 3408) + ) + ) +(CHARACTER H 8642EE + (CHARWD R 1.0) + (MAP + (SELECTFONT D 2) + (SETCHAR H 37C9) + ) + ) From 03b99617ee2212eecb4285e9ebf460bc188716bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Apr 2024 17:11:37 +0000 Subject: [PATCH 14/20] explicit error on make dist, since we no longer support it git-svn-id: svn://tug.org/texlive/trunk/Build@71119 c570f23f-e606-0410-a88d-b1316a301751 --- source/ChangeLog | 6 + source/Makefile.am | 13 + source/Makefile.in | 15 +- source/doc/tlbuild.info | 948 ++++++++++++++++++++-------------------- source/doc/tlbuild.texi | 28 +- 5 files changed, 526 insertions(+), 484 deletions(-) diff --git a/source/ChangeLog b/source/ChangeLog index 80de5a626..bb0dcfea3 100644 --- a/source/ChangeLog +++ b/source/ChangeLog @@ -1,3 +1,9 @@ +2024-04-29 Karl Berry + + * Makefile.am (distdir): override default dist generation, + since we don't try to keep make dist working any more. + https://tug.org/pipermail/tlbuild/2024q2/005547.html + 2023-12-31 Karl Berry * reautoconf: add -f / --force option to pass to autoreconf. diff --git a/source/Makefile.am b/source/Makefile.am index 7db6b6b51..1f74bf7c2 100644 --- a/source/Makefile.am +++ b/source/Makefile.am @@ -103,3 +103,16 @@ texlinks: .PHONY: triptrap triptrap: cd texk && $(MAKE) $(AM_MAKEFLAGS) $@ + +# We aren't trying to keep make dist working. Sorry. +distdir: + @echo "Sorry, we don't try to keep make dist working in TeX Live." + @echo + @echo "You can retrieve the development and/or released sources" + @echo " in various ways: https://tug.org/texlive/svn" + @echo + @echo "For info on how to integrate the built binaries into a runnable" + @echo " system, see: https://tug.org/texlive/build.html#deploy" + @echo + @echo "The result of make install is not usable by itself." + @false diff --git a/source/Makefile.in b/source/Makefile.in index e79b08d77..3deea9625 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -669,8 +669,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am distdir-am: $(DISTFILES) $(am__remove_distdir) @@ -1084,6 +1082,19 @@ texlinks: triptrap: cd texk && $(MAKE) $(AM_MAKEFLAGS) $@ +# We aren't trying to keep make dist working. Sorry. +distdir: + @echo "Sorry, we don't try to keep make dist working in TeX Live." + @echo + @echo "You can retrieve the development and/or released sources" + @echo " in various ways: https://tug.org/texlive/svn" + @echo + @echo "For info on how to integrate the built binaries into a runnable" + @echo " system, see: https://tug.org/texlive/build.html#deploy" + @echo + @echo "The result of make install is not usable by itself." + @false + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info index b17906cde..6892fe4bb 100644 --- a/source/doc/tlbuild.info +++ b/source/doc/tlbuild.info @@ -1,4 +1,4 @@ -This is tlbuild.info, produced by makeinfo version 6.7 from +This is tlbuild.info, produced by makeinfo version 7.1 from tlbuild.texi. This file documents the TeX Live build system and more. @@ -257,7 +257,7 @@ the source directory itself is not supported (sorry). * Build iteration:: What 'configure' and 'make' do in TL. * Build in parallel:: Simultaneous 'make' processes. -* Build distribution:: Making a distribution tarball. +* Build distribution:: (Not) making a distribution tarball. * Build one package:: Example of working on just one program. * Build one engine:: Example of building just one TeX engine. * Cross compilation:: Building on host X for target Y. @@ -312,15 +312,20 @@ File: tlbuild.info, Node: Build distribution, Next: Build one package, Prev: 4.3 Build distribution ====================== -Running 'make dist' at the top level creates a tarball -'tex-live-YYYY-MM-DD.tar.xz' from the TL source tree. Running 'make -distcheck' also verifies that this tarball suffices to build and install -all of TL. +Running 'make dist' or related targets at the top level outputs an error +message and fails. We no longer try to keep 'make dist' working, +although it could be restored if there is some use for it. - This is useful for checking consistency of the source tree and -Makefiles, but the result is not a complete or even usable TeX system, -since all the support files are lacking; *note Installing::. We do not -actually distribute any such tarball, and have no plans to do so. + The 'dist' target used to create a tarball +'tex-live-YYYY-MM-DD.tar.xz' from the TL source tree, and 'distcheck' +also verifies that this tarball suffices to build and install all of TL. + + However, the result was not a complete or even usable TeX system, +since all the support files are lacking. We do not actually distribute +any such tarball, and have no plans to do so. + + *Note Installing::, for more information on what to do with the +results of a build.  File: tlbuild.info, Node: Build one package, Next: Build one engine, Prev: Build distribution, Up: Building @@ -638,7 +643,8 @@ the source tree. not present in the TL source tree. The best basis for dealing with them is the TeX Live (plain text) database in 'Master/tlpkg/texlive.tlpdb', and/or the TeX Live installer, 'install-tl'. More information is under -'Master/tlpkg' and at . +'Master/tlpkg' and at and +. * Menu: @@ -4365,8 +4371,8 @@ package, dependencies are never removed. Options: *--backupdir* _directory_ - These options behave just as with the *note update: tlmgr update - [_option_...] [_pkg_...]. action (q.v.), except they apply to + These options behave just as with the *note update: tlmgr update + [_option_...] [_pkg_...]. action (q.v.), except they apply to making backups of packages before they are removed. The default is to make such a backup, that is, to save a copy of packages before removal. @@ -4380,8 +4386,8 @@ package, dependencies are never removed. Options: *--no-depends-at-all* - See above under *note install: tlmgr install [_option_...] _pkg_... - (and beware). + See above under *note install: tlmgr install [_option_...] + _pkg_.... (and beware). *--force* @@ -4634,7 +4640,7 @@ File: tlbuild.info, Node: tlmgr uninstall, Next: tlmgr update [_option_...] [_ B.6.30 uninstall ---------------- -Synonym for *note remove: tlmgr remove [_option_...] _pkg_.... +Synonym for *note remove: tlmgr remove [_option_...] _pkg_....  File: tlbuild.info, Node: tlmgr update [_option_...] [_pkg_...], Prev: tlmgr uninstall, Up: tlmgr ACTIONS @@ -4827,8 +4833,8 @@ must be specified. Options: *--no-depends-at-all* - See above under *note install: tlmgr install [_option_...] _pkg_... - (and beware). + See above under *note install: tlmgr install [_option_...] + _pkg_.... (and beware). *--force* @@ -5041,7 +5047,7 @@ be installed into a user tree. * tlmgr User mode logs::  -File: tlbuild.info, Node: tlmgr User mode install, Next: tlmgr User mode backup, restore, remove, update, Up: tlmgr USER MODE +File: tlbuild.info, Node: tlmgr User mode install, Next: tlmgr User mode backup, restore, remove, update, Up: tlmgr USER MODE B.9.1 User mode install ----------------------- @@ -5065,7 +5071,7 @@ of the user's 'updmap.cfg' in 'USERTREE/web2c/' is made, and then this file regenerated from the list of installed packages.  -File: tlbuild.info, Node: tlmgr User mode backup, restore, remove, update, Next: tlmgr User mode generate, option, paper, Prev: tlmgr User mode install, Up: tlmgr USER MODE +File: tlbuild.info, Node: tlmgr User mode backup, restore, remove, update, Next: tlmgr User mode generate, option, paper, Prev: tlmgr User mode install, Up: tlmgr USER MODE B.9.2 User mode backup, restore, remove, update ----------------------------------------------- @@ -5075,7 +5081,7 @@ installed in the user tree before proceeding; otherwise, they behave just as in normal mode.  -File: tlbuild.info, Node: tlmgr User mode generate, option, paper, Next: tlmgr User mode logs, Prev: tlmgr User mode backup, restore, remove, update, Up: tlmgr USER MODE +File: tlbuild.info, Node: tlmgr User mode generate, option, paper, Next: tlmgr User mode logs, Prev: tlmgr User mode backup, restore, remove, update, Up: tlmgr USER MODE B.9.3 User mode generate, option, paper --------------------------------------- @@ -5084,7 +5090,7 @@ In user mode, these actions operate only on the user tree's configuration files and/or 'texlive.tlpdb'.  -File: tlbuild.info, Node: tlmgr User mode logs, Prev: tlmgr User mode generate, option, paper, Up: tlmgr USER MODE +File: tlbuild.info, Node: tlmgr User mode logs, Prev: tlmgr User mode generate, option, paper, Up: tlmgr USER MODE B.9.4 User mode logs -------------------- @@ -5473,9 +5479,9 @@ messages for human consumption are written to stderr (normally they are written to stdout). The idea is that a program can get all the information it needs by reading stdout. - Currently this option only applies to the *note update: tlmgr update -[_option_...] [_pkg_...], *note install: tlmgr install [_option_...] -_pkg_..., and *note option: tlmgr option. actions. + Currently this option only applies to the *note update: tlmgr update +[_option_...] [_pkg_...], *note install: tlmgr install [_option_...] +_pkg_..., and *note option: tlmgr option. actions. * Menu: @@ -5735,7 +5741,6 @@ Index [index] * Menu: -* $@ target in normal make rules: Prerequisites. (line 13) * --bindir configure option: --prefix --bindir .... (line 6) * --bindir configure option <1>: --enable-multiplatform. @@ -5849,6 +5854,7 @@ Index * -fvisibility=hidden: Macros for compilers. (line 19) * -j make option: Build in parallel. (line 6) +* $@ target in normal make rules: Prerequisites. (line 13) * ac/withenable.ac: Adding a new program module. (line 42) * adapting TeX Live for distros: Distro builds. (line 54) @@ -5897,10 +5903,10 @@ Index * building: Building. (line 6) * building a distribution: Build distribution. (line 6) * building in parallel: Build in parallel. (line 6) -* C++11, removing dependent sources: Build one package. (line 85) -* C++11, required: Prerequisites. (line 17) * C, ANSI, required: Declarations and definitions. (line 6) +* C++11, removing dependent sources: Build one package. (line 85) +* C++11, required: Prerequisites. (line 17) * C99, avoided: Declarations and definitions. (line 6) * cache file, for configure: Build in parallel. (line 15) @@ -5908,8 +5914,8 @@ Index * callexe.c: Macros for Windows. (line 32) * CC: Variables for configure. (line 10) -* CC=C-COMPILER: Build one package. (line 77) * CC_BUILD: Cross problems. (line 13) +* CC=C-COMPILER: Build one package. (line 77) * ChangeLog: Adding a new program module. (line 73) * chktex: Declarations and definitions. @@ -6005,10 +6011,10 @@ Index * fontconfig library, required by xetex: Prerequisites. (line 40) * freetype cross compiling: Cross problems. (line 13) * freetype library: freetype library. (line 6) -* FreeType, requires gmake: Prerequisites. (line 13) * freetype-config: freetype library. (line 13) * freetype-config <1>: Variables for configure. (line 24) +* FreeType, requires gmake: Prerequisites. (line 13) * FT2_CONFIG: Variables for configure. (line 21) * gcc, default compilers: Build one package. (line 77) @@ -6032,11 +6038,11 @@ Index * ICU cross compiling: Cross problems. (line 20) * ICU libraries: Variables for configure. (line 24) -* ICU, requires C++11: Prerequisites. (line 17) -* icu-config: Variables for configure. - (line 24) * ICU_CONFIG: Variables for configure. (line 22) +* icu-config: Variables for configure. + (line 24) +* ICU, requires C++11: Prerequisites. (line 17) * infrastructure, tools needed for: Build system tools. (line 6) * inst/ top-level directory: Top-level directories. (line 39) @@ -6051,14 +6057,6 @@ Index (line 6) * kpathsea library: kpathsea library. (line 6) * kpathsea.ac: kpathsea library. (line 18) -* kpse-libpng-flags.m4: png library. (line 46) -* kpse-pkgs.m4: Overview of build system. - (line 30) -* kpse-zlib-flags.m4: zlib library. (line 6) -* kpsewhich: Variables for configure. - (line 30) -* KPSEWHICH: Variables for configure. - (line 29) * KPSE_ADD_FLAGS: Macros for library and header flags. (line 20) * KPSE_ALL_SYSTEM_FLAGS: Adding a new generic library module. @@ -6091,17 +6089,17 @@ Index (line 14) * KPSE_LARGEFILE: Macros for libraries. (line 8) -* KPSE_LIBPNG_FLAGS: Macros for library and header flags. - (line 10) -* KPSE_LIBPNG_FLAGS <1>: png library. (line 46) -* kpse_libs_pkgs: Adding a new generic library module. - (line 6) * KPSE_LIB_FLAGS: Macros for library and header flags. (line 6) * KPSE_LIB_FLAGS <1>: Adding a new generic library module. (line 26) * KPSE_LIB_SYSTEM_FLAGS: Adding a new generic library module. (line 34) +* KPSE_LIBPNG_FLAGS: Macros for library and header flags. + (line 10) +* KPSE_LIBPNG_FLAGS <1>: png library. (line 45) +* kpse_libs_pkgs: Adding a new generic library module. + (line 6) * KPSE_PROG_LEX: Macros for programs. (line 21) * KPSE_RESTORE_FLAGS: Macros for library and header flags. (line 24) @@ -6109,10 +6107,10 @@ Index (line 6) * kpse_texlibs_pkgs: Adding a new TeX-specific library module. (line 11) -* KPSE_TRY_LIB: png library. (line 18) +* KPSE_TRY_LIB: png library. (line 17) * KPSE_TRY_LIB <1>: Adding a new generic library module. (line 20) -* KPSE_TRY_LIBXX: png library. (line 31) +* KPSE_TRY_LIBXX: png library. (line 30) * KPSE_TRY_LIBXX <1>: Adding a new generic library module. (line 20) * kpse_utils_pkgs: Adding a new program module. @@ -6122,6 +6120,14 @@ Index (line 11) * KPSE_WITH_TEXLIB: Adding a new TeX-specific library module. (line 14) +* kpse-libpng-flags.m4: png library. (line 45) +* kpse-pkgs.m4: Overview of build system. + (line 30) +* kpse-zlib-flags.m4: zlib library. (line 6) +* kpsewhich: Variables for configure. + (line 30) +* KPSEWHICH: Variables for configure. + (line 29) * large file support: --disable-largefile. (line 6) * LATEX: Variables for configure. (line 40) @@ -6221,7 +6227,7 @@ Index * program modules: Program modules. (line 6) * program-specific configure options: Program-specific configure options. (line 6) -* proxy build system: png library. (line 36) +* proxy build system: png library. (line 35) * Python, required by ICU: Prerequisites. (line 23) * reautoconf: Build system tools. (line 28) * reautoconf, for new program: Adding a new program module. @@ -6271,11 +6277,11 @@ Index * TEXMFROOT for running standalone: Build one package. (line 44) * tie: Cross problems. (line 26) * timestamps, in repository: Build system tools. (line 38) +* TL_MAKE_FLAGS: Build in parallel. (line 11) * TLpatches/patch-...: Adding a new program module. (line 68) * TLpatches/TL-Changes: Adding a new program module. (line 64) -* TL_MAKE_FLAGS: Build in parallel. (line 11) * tools, for building: Build system tools. (line 6) * top-level directories: Top-level directories. (line 6) @@ -6290,15 +6296,15 @@ Index (line 52) * variables for configure: Variables for configure. (line 6) -* warning, discards qualifiers: Const. (line 30) * WARNING_C[XX]FLAGS: Macros for compilers. (line 9) +* warning, discards qualifiers: Const. (line 30) * web2c program: Cross problems. (line 13) * web2c.ac: Configure options for texk/web2c. (line 37) * wget: Linked scripts. (line 23) -* WIN32, Automake conditional: Macros for Windows. (line 16) * WIN32_WRAP, Automake conditional: Macros for Windows. (line 25) +* WIN32, Automake conditional: Macros for Windows. (line 16) * Windows, invoking scripts on: Linked scripts. (line 6) * Windows, macros for: Macros for Windows. (line 6) * withenable.ac, for new modules: Adding a new program module. @@ -6340,425 +6346,425 @@ Node: Overview of build system3943 Node: Prerequisites5994 Ref: Prerequisites-Footnote-18993 Node: Building9296 -Node: Build iteration10638 -Node: Build in parallel11682 -Node: Build distribution12433 -Node: Build one package13081 -Node: Build one engine17794 -Node: Cross compilation20406 -Node: Cross configuring21685 -Node: Cross problems23362 -Node: Installing25024 -Node: Installation directories26044 -Node: Linked scripts27862 -Node: Distro builds29357 -Node: Layout and infrastructure31733 -Node: Build system tools32564 -Node: Top-level directories34781 -Node: Autoconf macros37017 -Node: General setup macros37779 -Node: Macros for programs38654 -Node: Macros for compilers39455 -Node: Macros for libraries40919 -Node: Macros for library and header flags41345 -Node: Macros for Windows43256 -Node: Library modules44851 -Node: png library45340 -Node: zlib library47688 -Node: freetype library48203 -Node: kpathsea library48899 -Node: Program modules50278 -Node: t1utils package50706 -Node: xindy package51251 -Node: xdvik package52367 -Node: asymptote53426 -Node: Extending TeX Live53930 -Node: Adding a new program module54737 -Node: Adding a new engine59500 -Node: Adding a new generic library module61285 -Node: Adding a new TeX-specific library module63506 -Node: Configure options64204 -Node: Global configure options65585 -Node: --disable-native-texlive-build66127 -Node: --prefix --bindir ...67089 -Node: --disable-largefile67629 -Node: --disable-missing68171 -Node: --enable-compiler-warnings=LEVEL68572 -Node: --enable-cxx-runtime-hack69228 -Node: --enable-maintainer-mode69648 -Node: --enable-multiplatform70177 -Node: --enable-shared70750 -Node: --enable-silent-rules71121 -Node: --without-ln-s71573 -Node: --without-x71920 -Node: Program-specific configure options72108 -Node: --enable-PROG --disable-PROG72751 -Node: --disable-all-pkgs73024 -Node: Configure options for texk/web2c73807 -Node: Configure options for texk/bibtex-x76345 -Node: Configure options for texk/dvipdfm-x76888 -Node: Configure options for texk/dvisvgm77664 -Node: Configure options for texk/texlive78545 -Node: Configure options for texk/xdvik78966 -Node: Configure options for utils/xindy79587 -Node: Library-specific configure options80477 -Node: Configure options for kpathsea81438 -Node: Variables for configure82142 -Node: Coding conventions83568 -Node: Declarations and definitions84283 -Node: Const86457 -Node: Continuous integration88321 -Node: Transfer from Subversion to Github88985 -Node: Automatic update of the Git mirror91147 -Node: CI testing on Travis-CI91729 -Node: Releases on Github92438 -Node: install-tl92878 -Node: install-tl NAME93322 -Node: install-tl SYNOPSIS93502 -Node: install-tl DESCRIPTION93740 -Node: install-tl REFERENCES94937 -Node: install-tl EXAMPLES95546 -Ref: install-tl install-tl --paper=letter95997 -Ref: install-tl install-tl --scheme _scheme_96133 -Ref: install-tl install-tl --no-interaction96288 -Ref: install-tl install-tl --profile _texlive.profile_96440 -Node: install-tl OPTIONS96708 -Ref: install-tl *-gui* [[=]_module_]97205 -Ref: install-tl *-no-gui*97216 -Ref: install-tl text97424 -Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)97609 -Ref: install-tl *-lang* _llcode_98241 -Ref: install-tl *-repository* _url|path_98865 -Ref: install-tl *-select-repository*99759 -Ref: install-tl *-all-options*100177 -Ref: install-tl *-custom-bin* _path_100432 -Ref: install-tl *-debug-fakenet*101264 -Ref: install-tl *-debug-setup-vars*101478 -Ref: install-tl *-debug-translation*101626 -Ref: install-tl *-force-platform* _platform_101902 -Ref: install-tl *-help*, *--help*, *-?*102160 -Ref: install-tl *-in-place*102573 -Ref: install-tl *-init-from-profile* _profile_file_103118 -Ref: install-tl *-logfile* _file_103387 -Ref: install-tl *-no-cls*103738 -Ref: install-tl *-no-continue*103865 -Ref: install-tl *-no-doc-install*104436 -Ref: install-tl *-no-src-install*104455 -Ref: install-tl *-no-installation*105246 -Ref: install-tl *-no-interaction*105397 -Ref: install-tl *-no-persistent-downloads*105654 -Ref: install-tl *-persistent-downloads*105679 -Ref: install-tl *-no-verify-downloads*106286 -Ref: install-tl *-non-admin*106649 -Ref: install-tl *-paper* a4*|*letter106755 -Ref: install-tl *-portable*106951 -Ref: install-tl *-print-platform*107088 -Ref: install-tl *-profile* _profile_file_107286 -Ref: install-tl *-q*107507 -Ref: install-tl *-scheme* _scheme_107569 -Ref: install-tl *-texdir* _dir_107970 -Ref: install-tl *-texuserdir* _dir_108575 -Ref: install-tl *-texmflocal* _dir_108864 -Ref: install-tl *-texmfhome* _dir_109489 -Ref: install-tl *-texmfsysconfig* _dir_109798 -Ref: install-tl *-texmfsysvar* _dir_109820 -Ref: install-tl *-texmfconfig* _dir_109915 -Ref: install-tl *-texmfvar* _dir_109934 -Ref: install-tl *-v*110142 -Ref: install-tl *-version*, *--version*110298 -Node: install-tl PROFILES110432 -Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)113448 -Ref: install-tl instopt_adjustrepo (default 1)113524 -Ref: install-tl instopt_letter (default 0)113661 -Ref: install-tl instopt_portable (default 0)113752 -Ref: install-tl instopt_write18_restricted (default 1)114291 -Node: install-tl ENVIRONMENT VARIABLES115630 -Ref: install-tl NOPERLDOC115993 -Ref: install-tl TEXLIVE_DOWNLOADER116078 -Ref: install-tl TL_DOWNLOAD_PROGRAM116101 -Ref: install-tl TL_DOWNLOAD_ARGS116121 -Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK116325 -Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE116527 -Ref: install-tl TEXLIVE_INSTALL_NO_DISKCHECK116639 -Ref: install-tl TEXLIVE_INSTALL_NO_RESUME117055 -Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME117207 -Ref: install-tl TEXLIVE_INSTALL_PAPER117328 -Ref: install-tl TEXLIVE_INSTALL_PREFIX117474 -Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG117505 -Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR117533 -Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME117562 -Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL117592 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG117626 -Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR117657 -Node: install-tl DIRECTORY TREES118095 -Node: install-tl BUGS120679 -Node: install-tl AUTHORS AND COPYRIGHT121559 -Node: tlmgr121957 -Node: tlmgr NAME122463 -Node: tlmgr SYNOPSIS122607 -Node: tlmgr DESCRIPTION122809 -Node: tlmgr EXAMPLES123920 -Ref: tlmgr tlmgr option repository ctan124183 -Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet124256 -Ref: tlmgr tlmgr update --list124861 -Ref: tlmgr tlmgr update --all124954 -Ref: tlmgr tlmgr info _what_125111 -Ref: tlmgr tlmgr bug _what_125289 -Node: tlmgr OPTIONS125484 -Ref: tlmgr *--repository* _url|path_126017 -Ref: tlmgr /some/local/dir127203 -Ref: tlmgr file:/some/local/dir127232 -Ref: tlmgr ctan127305 -Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet127359 -Ref: tlmgr http://server/path/to/tlnet127700 -Ref: tlmgr https://server/path/to/tlnet128081 -Ref: tlmgr ftp://server/path/to/tlnet128549 -Ref: tlmgr user@machine:/path/to/tlnet128681 -Ref: tlmgr scp://user@machine/path/to/tlnet128722 -Ref: tlmgr ssh://user@machine/path/to/tlnet128763 -Ref: tlmgr *--gui* [_action_]129157 -Ref: tlmgr *--gui-lang* _llcode_129971 -Ref: tlmgr *--command-logfile* _file_130713 -Ref: tlmgr *--debug-translation*130980 -Ref: tlmgr *--machine-readable*131184 -Ref: tlmgr *--no-execute-actions*131453 -Ref: tlmgr *--package-logfile* _file_131647 -Ref: tlmgr *--pause*131902 -Ref: tlmgr *--persistent-downloads*132058 -Ref: tlmgr *--no-persistent-downloads*132087 -Ref: tlmgr *--pin-file*132582 -Ref: tlmgr *--usermode*132801 -Ref: tlmgr *--usertree* _dir_132922 -Ref: tlmgr *--verify-repo=[none|main|all]*133049 -Node: tlmgr ACTIONS133948 -Node: tlmgr help134841 -Node: tlmgr version135318 -Node: tlmgr backup135581 -Ref: tlmgr *backup [_option_...] --all*135758 -Ref: tlmgr *backup [_option_...] _pkg_...*135791 -Ref: tlmgr *--backupdir* _directory_136858 -Ref: tlmgr *--all*137076 -Ref: tlmgr *--clean*[=_N_]137329 -Ref: tlmgr *--dry-run*137657 -Node: tlmgr bug [_search-string_]137787 -Node: tlmgr candidates _pkg_138373 -Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]138743 -Ref: tlmgr *depends*139257 -Ref: tlmgr *executes*139599 -Ref: tlmgr *files*139714 -Ref: tlmgr *runfiles*139850 -Ref: tlmgr *texmfdbs*139987 -Ref: tlmgr - all items in TEXMFDBS have the !! prefix.140217 -Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).140293 -Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.140358 -Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.140433 -Ref: tlmgr *--use-svn*140459 -Node: tlmgr conf140600 -Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*140890 -Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*140955 -Node: tlmgr dump-tlpdb [_option_...] [--json]143371 -Ref: tlmgr *--local*143807 -Ref: tlmgr *--remote*143847 -Ref: tlmgr *--json*143886 -Node: tlmgr generate144457 -Ref: tlmgr *generate [_option_...] language*144653 -Ref: tlmgr *generate [_option_...] language.dat*144692 -Ref: tlmgr *generate [_option_...] language.def*144731 -Ref: tlmgr *generate [_option_...] language.dat.lua*144774 -Ref: tlmgr *--dest* _output_file_147102 -Ref: tlmgr *--localcfg* _local_conf_file_147679 -Ref: tlmgr *--rebuild-sys*147803 -Node: tlmgr gui148618 -Node: tlmgr info148798 -Ref: tlmgr *info [_option_...] _pkg_...*148960 -Ref: tlmgr *info [_option_...] collections*148994 -Ref: tlmgr *info [_option_...] schemes*149024 -Ref: tlmgr *--list*150555 -Ref: tlmgr *--only-installed*150870 -Ref: tlmgr *--only-remote*151059 -Ref: tlmgr *--data item1,item2,...*151364 -Ref: tlmgr *--json* 1152737 -Node: tlmgr init-usertree153120 -Node: tlmgr install [_option_...] _pkg_...153501 -Ref: tlmgr *--dry-run* 1154010 -Ref: tlmgr *--file*154128 -Ref: tlmgr *--force*154351 -Ref: tlmgr *--no-depends*154572 -Ref: tlmgr *--no-depends-at-all*154732 -Ref: tlmgr *--reinstall*155133 -Ref: tlmgr *--with-doc*155512 -Ref: tlmgr *--with-src*155526 -Node: tlmgr key156254 -Ref: tlmgr *key list*156412 -Ref: tlmgr *key add _file_*156430 -Ref: tlmgr *key remove _keyid_*156452 -Node: tlmgr list157046 -Node: tlmgr option157208 -Ref: tlmgr *option [--json] [show]*157364 -Ref: tlmgr *option [--json] showall|help*157396 -Ref: tlmgr *option _key_ [_value_]*157422 -Node: tlmgr paper162001 -Ref: tlmgr *paper [a4|letter]*162150 -Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>162227 -Ref: tlmgr *paper --json*162243 -Node: tlmgr path163458 -Ref: tlmgr *path [--windowsmode=user|admin] add*163624 -Ref: tlmgr *path [--windowsmode=user|admin] remove*163666 -Node: tlmgr pinning165181 -Ref: tlmgr pinning show165422 -Ref: tlmgr pinning add _repo_ _pkgglob_...165495 -Ref: tlmgr pinning remove _repo_ _pkgglob_...165614 -Ref: tlmgr pinning remove _repo_ --all165767 -Node: tlmgr platform165821 -Ref: tlmgr *platform list|add|remove _platform_...*166007 -Ref: tlmgr *platform set _platform_*166034 -Ref: tlmgr *platform set auto*166055 -Ref: tlmgr *--dry-run* 2166933 -Node: tlmgr postaction167052 -Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*167282 -Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*167356 -Ref: tlmgr *--windowsmode=[user|admin]*167676 -Ref: tlmgr *--fileassocmode=[1|2]*168101 -Ref: tlmgr *--all* 1168387 -Node: tlmgr print-platform168442 -Node: tlmgr print-platform-info168773 -Node: tlmgr remove [_option_...] _pkg_...169073 -Ref: tlmgr *--all* 2169558 -Ref: tlmgr *--backup*169669 -Ref: tlmgr *--backupdir* _directory_ 1169696 -Ref: tlmgr *--no-depends* 1170099 -Ref: tlmgr *--no-depends-at-all* 1170162 -Ref: tlmgr *--force* 1170266 -Ref: tlmgr *--dry-run* 3170740 -Node: tlmgr repository171117 -Ref: tlmgr *repository list*171305 -Ref: tlmgr *repository list _path|url|tag_*171339 -Ref: tlmgr *repository add _path_ [_tag_]*171372 -Ref: tlmgr *repository remove _path|tag_*171404 -Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*171458 -Ref: tlmgr *repository status*171479 -Ref: tlmgr The tag (which can be the same as the url);172706 -Node: tlmgr restore173184 -Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*173363 -Ref: tlmgr *restore [_option_...] --all*173394 -Ref: tlmgr *--all* 3174095 -Ref: tlmgr *--backupdir* _directory_ 2174310 -Ref: tlmgr *--dry-run* 4174492 -Ref: tlmgr *--force* 2174625 -Ref: tlmgr *--json* 2174672 -Node: tlmgr search174999 -Ref: tlmgr *search [_option_...] _what_*175163 -Ref: tlmgr *search [_option_...] --file _what_*175201 -Ref: tlmgr *search [_option_...] --all _what_*175238 -Ref: tlmgr *--file* 1175459 -Ref: tlmgr *--all* 4175522 -Ref: tlmgr *--global*175612 -Ref: tlmgr *--word*175740 -Node: tlmgr shell176055 -Ref: tlmgr protocol176790 -Ref: tlmgr help 1176854 -Ref: tlmgr version 1176907 -Ref: tlmgr quit, end, bye, byebye, EOF176975 -Ref: tlmgr restart176996 -Ref: tlmgr load [local|remote]177119 -Ref: tlmgr save177189 -Ref: tlmgr get [_var_] =item set [_var_ [_val_]]177312 -Node: tlmgr show177913 -Node: tlmgr uninstall178080 -Node: tlmgr update [_option_...] [_pkg_...]178310 -Ref: tlmgr *--all* 5178682 -Ref: tlmgr *--self*180862 -Ref: tlmgr *--dry-run* 5181627 -Ref: tlmgr *--list* [_pkg_]181805 -Ref: tlmgr *--exclude* _pkg_182495 -Ref: tlmgr *--no-auto-remove* [_pkg_...]183296 -Ref: tlmgr *--no-auto-install* [_pkg_...]183781 -Ref: tlmgr *--reinstall-forcibly-removed*184544 -Ref: tlmgr *--backup* 1185080 -Ref: tlmgr *--backupdir* _directory_ 3185107 -Ref: tlmgr *--no-depends* 2186274 -Ref: tlmgr *--no-depends-at-all* 2186478 -Ref: tlmgr *--force* 3186582 -Node: tlmgr CONFIGURATION FILE FOR TLMGR187573 -Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.188575 -Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.188707 -Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.188791 -Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).188840 -Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.188915 -Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.188990 -Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.189098 -Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.189243 -Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.189314 -Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.189831 -Node: tlmgr CRYPTOGRAPHIC VERIFICATION190663 -Node: tlmgr Configuration of GnuPG invocation192836 -Node: tlmgr USER MODE193474 -Node: tlmgr User mode install196345 -Node: tlmgr User mode backup, restore, remove, update197489 -Node: tlmgr User mode generate, option, paper197931 -Node: tlmgr User mode logs198294 -Node: tlmgr MULTIPLE REPOSITORIES198590 -Node: tlmgr Pinning200319 -Node: tlmgr GUI FOR TLMGR202242 -Node: tlmgr Main display203891 -Node: tlmgr Display configuration area204143 -Ref: tlmgr Status204504 -Ref: tlmgr Category204668 -Ref: tlmgr Match204854 -Ref: tlmgr Selection205035 -Ref: tlmgr Display configuration buttons205239 -Node: tlmgr Package list area205422 -Ref: tlmgr a checkbox206006 -Ref: tlmgr package name206142 -Ref: tlmgr local revision (and version)206241 -Ref: tlmgr remote revision (and version)206616 -Ref: tlmgr short description206913 -Node: tlmgr Main display action buttons206958 -Ref: tlmgr Update all installed207224 -Ref: tlmgr Update207596 -Ref: tlmgr Install207646 -Ref: tlmgr Remove207832 -Ref: tlmgr Backup208010 -Node: tlmgr Menu bar208167 -Ref: tlmgr tlmgr menu208390 -Ref: tlmgr Options menu208698 -Ref: tlmgr Actions menu209781 -Ref: tlmgr Help menu210209 -Node: tlmgr GUI options210343 -Ref: tlmgr -background _color_210589 -Ref: tlmgr -font " _fontname_ _fontsize_ "210654 -Ref: tlmgr -foreground _color_210812 -Ref: tlmgr -geometry _geomspec_210864 -Ref: tlmgr -xrm _xresource_211056 -Node: tlmgr MACHINE-READABLE OUTPUT211325 -Node: tlmgr Machine-readable update and install output212135 -Ref: tlmgr location-url _location_213411 -Ref: tlmgr total-bytes _count_213627 -Ref: tlmgr _pkgname_214037 -Ref: tlmgr _status_214247 -Ref: tlmgr d214325 -Ref: tlmgr f214385 -Ref: tlmgr u214564 -Ref: tlmgr r214610 -Ref: tlmgr a214733 -Ref: tlmgr i214911 -Ref: tlmgr I215030 -Ref: tlmgr _localrev_215132 -Ref: tlmgr _serverrev_215239 -Ref: tlmgr _size_215351 -Ref: tlmgr _runtime_215520 -Ref: tlmgr _esttot_215590 -Node: tlmgr Machine-readable option output215623 -Node: tlmgr ENVIRONMENT VARIABLES216135 -Ref: tlmgr TEXLIVE_COMPRESSOR216646 -Ref: tlmgr TEXLIVE_DOWNLOADER217494 -Ref: tlmgr TL_DOWNLOAD_PROGRAM217517 -Ref: tlmgr TL_DOWNLOAD_ARGS217537 -Ref: tlmgr TEXLIVE_PREFER_OWN218563 -Node: tlmgr AUTHORS AND COPYRIGHT219387 -Node: tlmgr POD ERRORS219810 -Ref: tlmgr Around line 8454:220035 -Node: Index220071 +Node: Build iteration10644 +Node: Build in parallel11688 +Node: Build distribution12439 +Node: Build one package13267 +Node: Build one engine17980 +Node: Cross compilation20592 +Node: Cross configuring21871 +Node: Cross problems23548 +Node: Installing25210 +Node: Installation directories26278 +Node: Linked scripts28096 +Node: Distro builds29591 +Node: Layout and infrastructure31967 +Node: Build system tools32798 +Node: Top-level directories35015 +Node: Autoconf macros37251 +Node: General setup macros38013 +Node: Macros for programs38888 +Node: Macros for compilers39689 +Node: Macros for libraries41153 +Node: Macros for library and header flags41579 +Node: Macros for Windows43490 +Node: Library modules45085 +Node: png library45574 +Node: zlib library47922 +Node: freetype library48437 +Node: kpathsea library49133 +Node: Program modules50512 +Node: t1utils package50940 +Node: xindy package51485 +Node: xdvik package52601 +Node: asymptote53660 +Node: Extending TeX Live54164 +Node: Adding a new program module54971 +Node: Adding a new engine59734 +Node: Adding a new generic library module61519 +Node: Adding a new TeX-specific library module63740 +Node: Configure options64438 +Node: Global configure options65819 +Node: --disable-native-texlive-build66361 +Node: --prefix --bindir ...67323 +Node: --disable-largefile67863 +Node: --disable-missing68405 +Node: --enable-compiler-warnings=LEVEL68806 +Node: --enable-cxx-runtime-hack69462 +Node: --enable-maintainer-mode69882 +Node: --enable-multiplatform70411 +Node: --enable-shared70984 +Node: --enable-silent-rules71355 +Node: --without-ln-s71807 +Node: --without-x72154 +Node: Program-specific configure options72342 +Node: --enable-PROG --disable-PROG72985 +Node: --disable-all-pkgs73258 +Node: Configure options for texk/web2c74041 +Node: Configure options for texk/bibtex-x76579 +Node: Configure options for texk/dvipdfm-x77122 +Node: Configure options for texk/dvisvgm77898 +Node: Configure options for texk/texlive78779 +Node: Configure options for texk/xdvik79200 +Node: Configure options for utils/xindy79821 +Node: Library-specific configure options80711 +Node: Configure options for kpathsea81672 +Node: Variables for configure82376 +Node: Coding conventions83802 +Node: Declarations and definitions84517 +Node: Const86691 +Node: Continuous integration88555 +Node: Transfer from Subversion to Github89219 +Node: Automatic update of the Git mirror91381 +Node: CI testing on Travis-CI91963 +Node: Releases on Github92672 +Node: install-tl93112 +Node: install-tl NAME93556 +Node: install-tl SYNOPSIS93736 +Node: install-tl DESCRIPTION93974 +Node: install-tl REFERENCES95171 +Node: install-tl EXAMPLES95780 +Ref: install-tl install-tl --paper=letter96231 +Ref: install-tl install-tl --scheme _scheme_96367 +Ref: install-tl install-tl --no-interaction96522 +Ref: install-tl install-tl --profile _texlive.profile_96674 +Node: install-tl OPTIONS96942 +Ref: install-tl *-gui* [[=]_module_]97439 +Ref: install-tl *-no-gui*97450 +Ref: install-tl text97658 +Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)97843 +Ref: install-tl *-lang* _llcode_98475 +Ref: install-tl *-repository* _url|path_99099 +Ref: install-tl *-select-repository*99993 +Ref: install-tl *-all-options*100411 +Ref: install-tl *-custom-bin* _path_100666 +Ref: install-tl *-debug-fakenet*101498 +Ref: install-tl *-debug-setup-vars*101712 +Ref: install-tl *-debug-translation*101860 +Ref: install-tl *-force-platform* _platform_102136 +Ref: install-tl *-help*, *--help*, *-?*102394 +Ref: install-tl *-in-place*102807 +Ref: install-tl *-init-from-profile* _profile_file_103352 +Ref: install-tl *-logfile* _file_103621 +Ref: install-tl *-no-cls*103972 +Ref: install-tl *-no-continue*104099 +Ref: install-tl *-no-doc-install*104670 +Ref: install-tl *-no-src-install*104689 +Ref: install-tl *-no-installation*105480 +Ref: install-tl *-no-interaction*105631 +Ref: install-tl *-no-persistent-downloads*105888 +Ref: install-tl *-persistent-downloads*105913 +Ref: install-tl *-no-verify-downloads*106520 +Ref: install-tl *-non-admin*106883 +Ref: install-tl *-paper* a4*|*letter106989 +Ref: install-tl *-portable*107185 +Ref: install-tl *-print-platform*107322 +Ref: install-tl *-profile* _profile_file_107520 +Ref: install-tl *-q*107741 +Ref: install-tl *-scheme* _scheme_107803 +Ref: install-tl *-texdir* _dir_108204 +Ref: install-tl *-texuserdir* _dir_108809 +Ref: install-tl *-texmflocal* _dir_109098 +Ref: install-tl *-texmfhome* _dir_109723 +Ref: install-tl *-texmfsysconfig* _dir_110032 +Ref: install-tl *-texmfsysvar* _dir_110054 +Ref: install-tl *-texmfconfig* _dir_110149 +Ref: install-tl *-texmfvar* _dir_110168 +Ref: install-tl *-v*110376 +Ref: install-tl *-version*, *--version*110532 +Node: install-tl PROFILES110666 +Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)113682 +Ref: install-tl instopt_adjustrepo (default 1)113758 +Ref: install-tl instopt_letter (default 0)113895 +Ref: install-tl instopt_portable (default 0)113986 +Ref: install-tl instopt_write18_restricted (default 1)114525 +Node: install-tl ENVIRONMENT VARIABLES115864 +Ref: install-tl NOPERLDOC116227 +Ref: install-tl TEXLIVE_DOWNLOADER116312 +Ref: install-tl TL_DOWNLOAD_PROGRAM116335 +Ref: install-tl TL_DOWNLOAD_ARGS116355 +Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK116559 +Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE116761 +Ref: install-tl TEXLIVE_INSTALL_NO_DISKCHECK116873 +Ref: install-tl TEXLIVE_INSTALL_NO_RESUME117289 +Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME117441 +Ref: install-tl TEXLIVE_INSTALL_PAPER117562 +Ref: install-tl TEXLIVE_INSTALL_PREFIX117708 +Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG117739 +Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR117767 +Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME117796 +Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL117826 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG117860 +Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR117891 +Node: install-tl DIRECTORY TREES118329 +Node: install-tl BUGS120913 +Node: install-tl AUTHORS AND COPYRIGHT121793 +Node: tlmgr122191 +Node: tlmgr NAME122697 +Node: tlmgr SYNOPSIS122841 +Node: tlmgr DESCRIPTION123043 +Node: tlmgr EXAMPLES124154 +Ref: tlmgr tlmgr option repository ctan124417 +Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet124490 +Ref: tlmgr tlmgr update --list125095 +Ref: tlmgr tlmgr update --all125188 +Ref: tlmgr tlmgr info _what_125345 +Ref: tlmgr tlmgr bug _what_125523 +Node: tlmgr OPTIONS125718 +Ref: tlmgr *--repository* _url|path_126251 +Ref: tlmgr /some/local/dir127437 +Ref: tlmgr file:/some/local/dir127466 +Ref: tlmgr ctan127539 +Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet127593 +Ref: tlmgr http://server/path/to/tlnet127934 +Ref: tlmgr https://server/path/to/tlnet128315 +Ref: tlmgr ftp://server/path/to/tlnet128783 +Ref: tlmgr user@machine:/path/to/tlnet128915 +Ref: tlmgr scp://user@machine/path/to/tlnet128956 +Ref: tlmgr ssh://user@machine/path/to/tlnet128997 +Ref: tlmgr *--gui* [_action_]129391 +Ref: tlmgr *--gui-lang* _llcode_130205 +Ref: tlmgr *--command-logfile* _file_130947 +Ref: tlmgr *--debug-translation*131214 +Ref: tlmgr *--machine-readable*131418 +Ref: tlmgr *--no-execute-actions*131687 +Ref: tlmgr *--package-logfile* _file_131881 +Ref: tlmgr *--pause*132136 +Ref: tlmgr *--persistent-downloads*132292 +Ref: tlmgr *--no-persistent-downloads*132321 +Ref: tlmgr *--pin-file*132816 +Ref: tlmgr *--usermode*133035 +Ref: tlmgr *--usertree* _dir_133156 +Ref: tlmgr *--verify-repo=[none|main|all]*133283 +Node: tlmgr ACTIONS134182 +Node: tlmgr help135075 +Node: tlmgr version135552 +Node: tlmgr backup135815 +Ref: tlmgr *backup [_option_...] --all*135992 +Ref: tlmgr *backup [_option_...] _pkg_...*136025 +Ref: tlmgr *--backupdir* _directory_137092 +Ref: tlmgr *--all*137310 +Ref: tlmgr *--clean*[=_N_]137563 +Ref: tlmgr *--dry-run*137891 +Node: tlmgr bug [_search-string_]138021 +Node: tlmgr candidates _pkg_138607 +Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]138977 +Ref: tlmgr *depends*139491 +Ref: tlmgr *executes*139833 +Ref: tlmgr *files*139948 +Ref: tlmgr *runfiles*140084 +Ref: tlmgr *texmfdbs*140221 +Ref: tlmgr - all items in TEXMFDBS have the !! prefix.140451 +Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).140527 +Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.140592 +Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.140667 +Ref: tlmgr *--use-svn*140693 +Node: tlmgr conf140834 +Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*141124 +Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*141189 +Node: tlmgr dump-tlpdb [_option_...] [--json]143605 +Ref: tlmgr *--local*144041 +Ref: tlmgr *--remote*144081 +Ref: tlmgr *--json*144120 +Node: tlmgr generate144691 +Ref: tlmgr *generate [_option_...] language*144887 +Ref: tlmgr *generate [_option_...] language.dat*144926 +Ref: tlmgr *generate [_option_...] language.def*144965 +Ref: tlmgr *generate [_option_...] language.dat.lua*145008 +Ref: tlmgr *--dest* _output_file_147336 +Ref: tlmgr *--localcfg* _local_conf_file_147913 +Ref: tlmgr *--rebuild-sys*148037 +Node: tlmgr gui148852 +Node: tlmgr info149032 +Ref: tlmgr *info [_option_...] _pkg_...*149194 +Ref: tlmgr *info [_option_...] collections*149228 +Ref: tlmgr *info [_option_...] schemes*149258 +Ref: tlmgr *--list*150789 +Ref: tlmgr *--only-installed*151104 +Ref: tlmgr *--only-remote*151293 +Ref: tlmgr *--data item1,item2,...*151598 +Ref: tlmgr *--json* 1152971 +Node: tlmgr init-usertree153354 +Node: tlmgr install [_option_...] _pkg_...153735 +Ref: tlmgr *--dry-run* 1154244 +Ref: tlmgr *--file*154362 +Ref: tlmgr *--force*154585 +Ref: tlmgr *--no-depends*154806 +Ref: tlmgr *--no-depends-at-all*154966 +Ref: tlmgr *--reinstall*155367 +Ref: tlmgr *--with-doc*155746 +Ref: tlmgr *--with-src*155760 +Node: tlmgr key156488 +Ref: tlmgr *key list*156646 +Ref: tlmgr *key add _file_*156664 +Ref: tlmgr *key remove _keyid_*156686 +Node: tlmgr list157280 +Node: tlmgr option157442 +Ref: tlmgr *option [--json] [show]*157598 +Ref: tlmgr *option [--json] showall|help*157630 +Ref: tlmgr *option _key_ [_value_]*157656 +Node: tlmgr paper162235 +Ref: tlmgr *paper [a4|letter]*162384 +Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>162461 +Ref: tlmgr *paper --json*162477 +Node: tlmgr path163692 +Ref: tlmgr *path [--windowsmode=user|admin] add*163858 +Ref: tlmgr *path [--windowsmode=user|admin] remove*163900 +Node: tlmgr pinning165415 +Ref: tlmgr pinning show165656 +Ref: tlmgr pinning add _repo_ _pkgglob_...165729 +Ref: tlmgr pinning remove _repo_ _pkgglob_...165848 +Ref: tlmgr pinning remove _repo_ --all166001 +Node: tlmgr platform166055 +Ref: tlmgr *platform list|add|remove _platform_...*166241 +Ref: tlmgr *platform set _platform_*166268 +Ref: tlmgr *platform set auto*166289 +Ref: tlmgr *--dry-run* 2167167 +Node: tlmgr postaction167286 +Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*167516 +Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*167590 +Ref: tlmgr *--windowsmode=[user|admin]*167910 +Ref: tlmgr *--fileassocmode=[1|2]*168335 +Ref: tlmgr *--all* 1168621 +Node: tlmgr print-platform168676 +Node: tlmgr print-platform-info169007 +Node: tlmgr remove [_option_...] _pkg_...169307 +Ref: tlmgr *--all* 2169792 +Ref: tlmgr *--backup*169903 +Ref: tlmgr *--backupdir* _directory_ 1169930 +Ref: tlmgr *--no-depends* 1170335 +Ref: tlmgr *--no-depends-at-all* 1170398 +Ref: tlmgr *--force* 1170505 +Ref: tlmgr *--dry-run* 3170979 +Node: tlmgr repository171356 +Ref: tlmgr *repository list*171544 +Ref: tlmgr *repository list _path|url|tag_*171578 +Ref: tlmgr *repository add _path_ [_tag_]*171611 +Ref: tlmgr *repository remove _path|tag_*171643 +Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*171697 +Ref: tlmgr *repository status*171718 +Ref: tlmgr The tag (which can be the same as the url);172945 +Node: tlmgr restore173423 +Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*173602 +Ref: tlmgr *restore [_option_...] --all*173633 +Ref: tlmgr *--all* 3174334 +Ref: tlmgr *--backupdir* _directory_ 2174549 +Ref: tlmgr *--dry-run* 4174731 +Ref: tlmgr *--force* 2174864 +Ref: tlmgr *--json* 2174911 +Node: tlmgr search175238 +Ref: tlmgr *search [_option_...] _what_*175402 +Ref: tlmgr *search [_option_...] --file _what_*175440 +Ref: tlmgr *search [_option_...] --all _what_*175477 +Ref: tlmgr *--file* 1175698 +Ref: tlmgr *--all* 4175761 +Ref: tlmgr *--global*175851 +Ref: tlmgr *--word*175979 +Node: tlmgr shell176294 +Ref: tlmgr protocol177029 +Ref: tlmgr help 1177093 +Ref: tlmgr version 1177146 +Ref: tlmgr quit, end, bye, byebye, EOF177214 +Ref: tlmgr restart177235 +Ref: tlmgr load [local|remote]177358 +Ref: tlmgr save177428 +Ref: tlmgr get [_var_] =item set [_var_ [_val_]]177551 +Node: tlmgr show178152 +Node: tlmgr uninstall178319 +Node: tlmgr update [_option_...] [_pkg_...]178551 +Ref: tlmgr *--all* 5178923 +Ref: tlmgr *--self*181103 +Ref: tlmgr *--dry-run* 5181868 +Ref: tlmgr *--list* [_pkg_]182046 +Ref: tlmgr *--exclude* _pkg_182736 +Ref: tlmgr *--no-auto-remove* [_pkg_...]183537 +Ref: tlmgr *--no-auto-install* [_pkg_...]184022 +Ref: tlmgr *--reinstall-forcibly-removed*184785 +Ref: tlmgr *--backup* 1185321 +Ref: tlmgr *--backupdir* _directory_ 3185348 +Ref: tlmgr *--no-depends* 2186515 +Ref: tlmgr *--no-depends-at-all* 2186719 +Ref: tlmgr *--force* 3186826 +Node: tlmgr CONFIGURATION FILE FOR TLMGR187817 +Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.188819 +Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.188951 +Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.189035 +Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).189084 +Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.189159 +Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.189234 +Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.189342 +Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.189487 +Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.189558 +Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.190075 +Node: tlmgr CRYPTOGRAPHIC VERIFICATION190907 +Node: tlmgr Configuration of GnuPG invocation193080 +Node: tlmgr USER MODE193718 +Node: tlmgr User mode install196589 +Node: tlmgr User mode backup, restore, remove, update197735 +Node: tlmgr User mode generate, option, paper198181 +Node: tlmgr User mode logs198548 +Node: tlmgr MULTIPLE REPOSITORIES198846 +Node: tlmgr Pinning200575 +Node: tlmgr GUI FOR TLMGR202498 +Node: tlmgr Main display204147 +Node: tlmgr Display configuration area204399 +Ref: tlmgr Status204760 +Ref: tlmgr Category204924 +Ref: tlmgr Match205110 +Ref: tlmgr Selection205291 +Ref: tlmgr Display configuration buttons205495 +Node: tlmgr Package list area205678 +Ref: tlmgr a checkbox206262 +Ref: tlmgr package name206398 +Ref: tlmgr local revision (and version)206497 +Ref: tlmgr remote revision (and version)206872 +Ref: tlmgr short description207169 +Node: tlmgr Main display action buttons207214 +Ref: tlmgr Update all installed207480 +Ref: tlmgr Update207852 +Ref: tlmgr Install207902 +Ref: tlmgr Remove208088 +Ref: tlmgr Backup208266 +Node: tlmgr Menu bar208423 +Ref: tlmgr tlmgr menu208646 +Ref: tlmgr Options menu208954 +Ref: tlmgr Actions menu210037 +Ref: tlmgr Help menu210465 +Node: tlmgr GUI options210599 +Ref: tlmgr -background _color_210845 +Ref: tlmgr -font " _fontname_ _fontsize_ "210910 +Ref: tlmgr -foreground _color_211068 +Ref: tlmgr -geometry _geomspec_211120 +Ref: tlmgr -xrm _xresource_211312 +Node: tlmgr MACHINE-READABLE OUTPUT211581 +Node: tlmgr Machine-readable update and install output212395 +Ref: tlmgr location-url _location_213671 +Ref: tlmgr total-bytes _count_213887 +Ref: tlmgr _pkgname_214297 +Ref: tlmgr _status_214507 +Ref: tlmgr d214585 +Ref: tlmgr f214645 +Ref: tlmgr u214824 +Ref: tlmgr r214870 +Ref: tlmgr a214993 +Ref: tlmgr i215171 +Ref: tlmgr I215290 +Ref: tlmgr _localrev_215392 +Ref: tlmgr _serverrev_215499 +Ref: tlmgr _size_215611 +Ref: tlmgr _runtime_215780 +Ref: tlmgr _esttot_215850 +Node: tlmgr Machine-readable option output215883 +Node: tlmgr ENVIRONMENT VARIABLES216395 +Ref: tlmgr TEXLIVE_COMPRESSOR216906 +Ref: tlmgr TEXLIVE_DOWNLOADER217754 +Ref: tlmgr TL_DOWNLOAD_PROGRAM217777 +Ref: tlmgr TL_DOWNLOAD_ARGS217797 +Ref: tlmgr TEXLIVE_PREFER_OWN218823 +Node: tlmgr AUTHORS AND COPYRIGHT219647 +Node: tlmgr POD ERRORS220070 +Ref: tlmgr Around line 8454:220295 +Node: Index220331  End Tag Table diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi index a889b42b4..43fb68f3d 100644 --- a/source/doc/tlbuild.texi +++ b/source/doc/tlbuild.texi @@ -349,7 +349,7 @@ Building in the source directory itself is not supported (sorry). @menu * Build iteration:: What @code{configure} and @code{make} do in TL. * Build in parallel:: Simultaneous @code{make} processes. -* Build distribution:: Making a distribution tarball. +* Build distribution:: (Not) making a distribution tarball. * Build one package:: Example of working on just one program. * Build one engine:: Example of building just one @TeX{} engine. * Cross compilation:: Building on host X for target Y. @@ -420,16 +420,21 @@ configure cache file, i.e., specifying the @code{configure} option @cindex distribution tarball, making @cindex @code{dist} and @code{distcheck} targets for @code{make} -Running @code{make dist} at the top level creates a tarball +Running @code{make dist} or related targets at the top level outputs an +error message and fails. We no longer try to keep @code{make dist} +working, although it could be restored if there is some use for it. + +The @code{dist} target used to create a tarball @file{tex-live-@var{yyyy}-@var{mm}-@var{dd}.tar.xz} from the TL source -tree. Running @code{make distcheck} also verifies that this tarball -suffices to build and install all of TL. +tree, and @code{distcheck} also verifies that this tarball suffices to +build and install all of TL. + +However, the result was not a complete or even usable @TeX{} system, +since all the support files are lacking. We do not actually +distribute any such tarball, and have no plans to do so. -This is useful for checking consistency of the source tree and -Makefiles, but the result is not a complete or even usable @TeX{} -system, since all the support files are lacking; @pxref{Installing}. -We do not actually distribute any such tarball, and have no plans to -do so. +@xref{Installing}, for more information on what to do with the results +of a build. @node Build one package @section Build one package @@ -811,8 +816,9 @@ not present in the TL source tree. The best basis for dealing with them is the @TL{} (plain text) database in @file{Master/tlpkg/texlive.tlpdb}, and/or the @TL{} installer, @code{install-tl}. More information is under @file{Master/tlpkg} and -at @url{https://tug.org/texlive/distro.html}. - +at @url{https://tug.org/texlive/distro.html} and + @url{https://tug.org/texlive/build.html#deploy}. + @menu * Installation directories:: The prefix, @code{bindir}, etc., directories. * Linked scripts:: Scripts not maintained in the sources. From 1d1487a08bd8dfcf82c6c35544c8eb26de07b155 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Apr 2024 17:24:23 +0000 Subject: [PATCH 15/20] intermediate epstopdf.pl from John Collins to better detect Msys vs. Cygwin vs. native Windows git-svn-id: svn://tug.org/texlive/trunk/Build@71120 c570f23f-e606-0410-a88d-b1316a301751 From b135907fff66eedb9a5a95b57223459c5eb4f3df Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Apr 2024 17:27:25 +0000 Subject: [PATCH 16/20] 2.34 release: recognize --debug specially as first arg; wording/doc tweaks git-svn-id: svn://tug.org/texlive/trunk/Build@71121 c570f23f-e606-0410-a88d-b1316a301751 From 45e6b3a053cd28f865e42727722ec82cea0e939d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Apr 2024 20:32:23 +0000 Subject: [PATCH 17/20] epstopdf (29apr24) git-svn-id: svn://tug.org/texlive/trunk/Build@71134 c570f23f-e606-0410-a88d-b1316a301751 From 33e3faa42d7a3d36381f60f5e8a3148367f1be0f Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Wed, 1 May 2024 01:03:47 +0000 Subject: [PATCH 18/20] {,e}uptex: Revert some patches git-svn-id: svn://tug.org/texlive/trunk/Build@71143 c570f23f-e606-0410-a88d-b1316a301751 --- source/texk/web2c/euptexdir/ChangeLog | 4 +++ source/texk/web2c/euptexdir/pdfutils.ch | 15 ++++++++++ source/texk/web2c/uptexdir/ChangeLog | 4 +++ source/texk/web2c/uptexdir/uptex-m.ch | 39 ++++--------------------- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/source/texk/web2c/euptexdir/ChangeLog b/source/texk/web2c/euptexdir/ChangeLog index 136715e33..5d39c9205 100644 --- a/source/texk/web2c/euptexdir/ChangeLog +++ b/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2024-05-01 TANAKA Takuji + + * pdfutils.ch: Revert some patches. + 2024-04-27 TANAKA Takuji * eptex.ech, pdfutils.ch, euptex.defines: diff --git a/source/texk/web2c/euptexdir/pdfutils.ch b/source/texk/web2c/euptexdir/pdfutils.ch index 1f39749cd..f62a48be1 100644 --- a/source/texk/web2c/euptexdir/pdfutils.ch +++ b/source/texk/web2c/euptexdir/pdfutils.ch @@ -1882,6 +1882,21 @@ if_in_csname_code: b := is_in_csname; if_font_char_code:begin scan_font_ident; n:=cur_val; @z +@x +procedure print_kanji(@!s:KANJI_code); {prints a single character} +@y +procedure print_kanji(@!s:KANJI_code); {prints a single character} +@z + +@x +else begin + s:=toBUFF(s mod max_cjk_val); +@y +else begin + if isprint_utf8 then s:=UCStoUTF8(toUCS(s mod max_cjk_val)) + else s:=toBUFF(s mod max_cjk_val); +@z + @x @* \[54] System-dependent changes. @y diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index 5ca5f7b8b..90b3bd029 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2024-05-01 TANAKA Takuji + + * uptex-m.ch: Revert some patches. + 2024-04-27 TANAKA Takuji * uptex-m.ch, kanji.{c,h}, updvitype.ch, uptex.defines: diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch index 8c0f66208..3daecd4e4 100644 --- a/source/texk/web2c/uptexdir/uptex-m.ch +++ b/source/texk/web2c/uptexdir/uptex-m.ch @@ -48,7 +48,7 @@ % (2022-07-23) TTK upTeX u1.29 % (2022-12-09) HK Hironori Kitagawa fixed a bug in \char, \kchar. % (2023-09-16) TTK upTeX u1.30 -% (2024-04-27) TTK upTeX u1.35 +% (2024-05-01) TTK upTeX u1.35 @x \def\pTeX{p\kern-.15em\TeX} @@ -580,13 +580,6 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir else cur_tok:=(cur_cmd*max_char_val)+cur_chr @z -@x -@!j:0..buf_size; {index into |buffer|} -@y -@!j:0..buf_size; {index into |buffer|} -@!v,@!nn,@!jj: integer; -@z - @x if check_kanji(info(p)) then {|wchar_token|} begin buffer[j]:=Hi(info(p)); buffer2[j]:=1; incr(j); buffer2[j]:=1; @@ -595,31 +588,11 @@ if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to fir buffer[j]:=Lo(info(p)); incr(j); p:=link(p); @y if check_kanji(info(p)) then {|wchar_token|} - begin - if (isinternalUPTEX) then begin - t:=ktokentochr(info(p)); - t:=toUCS(t); - nn:=UVSgetcodepointlength(t); - jj:=1; - while jj0) then begin - v:=UCStoUTF8(v); - if BYTE1(v)<>0 then begin buffer[j]:=BYTE1(v); buffer2[j]:=1; incr(j); end; - if BYTE2(v)<>0 then begin buffer[j]:=BYTE2(v); buffer2[j]:=1; incr(j); end; - if BYTE3(v)<>0 then begin buffer[j]:=BYTE3(v); buffer2[j]:=1; incr(j); end; - buffer[j]:=BYTE4(v); buffer2[j]:=1; incr(j); - end; - incr(jj); - end - end - else begin - t:=toBUFF(info(p) mod max_cjk_val); - if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end; - if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end; - if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end; - buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j); - end; + begin t:=toBUFF(info(p) mod max_cjk_val); + if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); buffer2[j]:=1; incr(j); end; + if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); buffer2[j]:=1; incr(j); end; + if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); buffer2[j]:=1; incr(j); end; + buffer[j]:=BYTE4(t); buffer2[j]:=1; incr(j); p:=link(p); end else From f9592dcbded4020f002c585afa06299eca366b37 Mon Sep 17 00:00:00 2001 From: TANAKA Takuji Date: Wed, 1 May 2024 19:44:46 +0900 Subject: [PATCH 19/20] README.md: remove eptex, pbibtex --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 084966fd0..c4d94a0a9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This bundle also provides the latest "upstream" sources for the followings: * ptexenc * ptex, (u)pbibtex, (u)pdvitype, (u)ppltotf, (u)ptftopl -* eptex +* eptex extention as a part of euptex * makejvf * mendex * dviout-util @@ -25,9 +25,9 @@ If you have issues, please let us know from the above page. ## Contents The bundle includes sources of: -ptex, eptex, uptex, euptex, +ptex, uptex, euptex, dvips, dvipdfmx, dvi2tty, makejvf, mendex, upmendex, -pbibtex, upbibtex, pmpost, upmpost, +upbibtex, pmpost, upmpost, dviout-util (dvispc, chkdvifont), seetex (dvibook, dviconcat, dviselect, dvitodvi), dvidvi, bibtex-x, related tools From 320633cb07a13b73082a0c29ced8cdbe053adf41 Mon Sep 17 00:00:00 2001 From: Yukimasa Morimi Date: Sat, 4 May 2024 13:25:39 +0900 Subject: [PATCH 20/20] uptex-m.ch: fix begin-end --- source/texk/web2c/uptexdir/uptex-m.ch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/texk/web2c/uptexdir/uptex-m.ch b/source/texk/web2c/uptexdir/uptex-m.ch index 3daecd4e4..f4b7c7272 100644 --- a/source/texk/web2c/uptexdir/uptex-m.ch +++ b/source/texk/web2c/uptexdir/uptex-m.ch @@ -1316,9 +1316,8 @@ begin if is_char_node(link(p)) then ins_kp:=false; goto again_2 end - end end; - begin if not disp_called then + if not disp_called then begin prev_node:=tail; tail_append(get_node(small_node_size)); type(tail):=disp_node; disp_dimen(tail):=0; disp_called:=true end;