diff options
34 files changed, 652 insertions, 146 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README index 97d3f02c976..a94263d8e5c 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -68,9 +68,9 @@ kpathsea - maintained here by Karl Berry, et al. lacheck - checked 25apr11 http://mirror.ctan.org/support/lacheck/lacheck-1.26.tar.gz -lcdf-typetools 2.90 - checked 6jun11 +lcdf-typetools 2.92 - checked 16aug11 http://www.lcdf.org/type/ - http://www.lcdf.org/type/lcdf-typetools-2.90.tar.gz + http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz makeindexk - maintained here, by us diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index 148be5b761f..8ee6e84db50 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -82,6 +82,7 @@ EXTRA_DIST = \ include/efont/ttfkern.hh \ glyphlist.txt \ texglyphlist.txt \ + texglyphlist-g2u.txt \ 7t.enc liblcdf libefont: @@ -95,6 +96,12 @@ versionize: perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec +dist-hook: + if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp $(top_srcdir)/glyphtounicode.tex $(distdir); fi + +$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl + cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex + .PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 ## Changes for TeX Live diff --git a/Build/source/texk/lcdf-typetools/Makefile.am.orig b/Build/source/texk/lcdf-typetools/Makefile.am.orig index 8f31ca92058..1e0dd8d9cd7 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am.orig +++ b/Build/source/texk/lcdf-typetools/Makefile.am.orig @@ -60,6 +60,7 @@ EXTRA_DIST = \ include/efont/ttfkern.hh \ glyphlist.txt \ texglyphlist.txt \ + texglyphlist-g2u.txt \ 7t.enc liblcdf libefont: @@ -73,4 +74,10 @@ versionize: perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec +dist-hook: + if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp $(top_srcdir)/glyphtounicode.tex $(distdir); fi + +$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl + cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex + .PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index b9084113b4c..452ae791bd6 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -309,7 +309,7 @@ EXTRA_DIST = ONEWS lcdf-typetools.spec include/config.h \ include/efont/t1mm.hh include/efont/t1rw.hh \ include/efont/t1unparser.hh include/efont/ttfcs.hh \ include/efont/ttfhead.hh include/efont/ttfkern.hh \ - glyphlist.txt texglyphlist.txt 7t.enc \ + glyphlist.txt texglyphlist.txt texglyphlist-g2u.txt 7t.enc \ lcdf-typetools-$(LCDF_TYPETOOLS_VERSION)-PATCHES \ Makefile.am.orig configure.ac.orig all: autoconf.h @@ -638,6 +638,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -865,21 +868,22 @@ uninstall-am: uninstall-encDATA uninstall-glyphlistDATA \ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local am--refresh check check-am clean \ clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-encDATA install-exec \ - install-exec-am install-glyphlistDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgdataDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-encDATA \ - uninstall-glyphlistDATA uninstall-pkgdataDATA + dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-encDATA install-exec install-exec-am \ + install-glyphlistDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgdataDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-encDATA uninstall-glyphlistDATA \ + uninstall-pkgdataDATA all-local: config.force @@ -899,6 +903,12 @@ versionize: perl -pi -e 's/^(\U$(PACKAGE)\E) [\d.ab]+$$/$$1 $(VERSION)/;' $(top_srcdir)/README perl -pi -e 's/^Version: [\d.ab]+$$/Version: $(VERSION)/;' $(top_srcdir)/lcdf-typetools.spec +dist-hook: + if test -f $(top_srcdir)/make-glyphtounicode.pl; then (cd $(top_srcdir); perl make-glyphtounicode.pl) > $(distdir)/glyphtounicode.tex; elif test -f $(top_srcdir)/glyphtounicode.tex; then cp $(top_srcdir)/glyphtounicode.tex $(distdir); fi + +$(top_srcdir)/glyphtounicode.tex: $(top_srcdir)/glyphlist.txt $(top_srcdir)/texglyphlist.txt $(top_srcdir)/texglyphlist-g2u.txt $(top_srcdir)/make-glyphtounicode.pl + cd $(top_srcdir); perl make-glyphtounicode.pl > glyphtounicode.tex + .PHONY: rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/texk/lcdf-typetools/NEWS b/Build/source/texk/lcdf-typetools/NEWS index d8325b4f72a..42cb272b7ed 100644 --- a/Build/source/texk/lcdf-typetools/NEWS +++ b/Build/source/texk/lcdf-typetools/NEWS @@ -1,5 +1,16 @@ LCDF Typetools NEWS +Version 2.92 14.Aug.2011 + +* Correct horrible x86-64 byte-order issue. Bug reported by Michael Ummels. + + +Version 2.91 13.Jun.2011 + +* Correct some compilation problems on unusual systems reported by Vladimir + Volovich. + + Version 2.90 3.Jun.2011 * Correct crash on glyph names that start with a dot. Marc van Dongen diff --git a/Build/source/texk/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/README index 0b339042a0e..767b150e3c7 100644 --- a/Build/source/texk/lcdf-typetools/README +++ b/Build/source/texk/lcdf-typetools/README @@ -1,4 +1,4 @@ -LCDF-TYPETOOLS 2.90 +LCDF-TYPETOOLS 2.92 =================== USAGE diff --git a/Build/source/texk/lcdf-typetools/autoconf.h.in b/Build/source/texk/lcdf-typetools/autoconf.h.in index 7675fbaea84..1a9b65d1d3b 100644 --- a/Build/source/texk/lcdf-typetools/autoconf.h.in +++ b/Build/source/texk/lcdf-typetools/autoconf.h.in @@ -1,7 +1,7 @@ /* autoconf.h.in. Generated from configure.ac by autoheader. */ -/* Define if strtod is broken. */ -#undef BROKEN_STRTOD +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID @@ -33,6 +33,12 @@ /* Define to 1 if you have the `bcopy' function. */ #undef HAVE_BCOPY +/* Define if strnlen is broken. */ +#undef HAVE_BROKEN_STRNLEN + +/* Define if strtod is broken. */ +#undef HAVE_BROKEN_STRTOD + /* Define to 1 if you have the <byteorder.h> header file. */ #undef HAVE_BYTEORDER_H @@ -46,6 +52,10 @@ if you don't. */ #undef HAVE_DECL_KPSE_OPENTYPE_FORMAT +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#undef HAVE_DECL_STRNLEN + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -146,6 +156,9 @@ /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR @@ -205,6 +218,9 @@ /* Define if you have u_intXX_t types but not uintXX_t types. */ #undef HAVE_U_INT_TYPES +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + /* Define to 1 if you have the `waitpid' function. */ #undef HAVE_WAITPID @@ -267,6 +283,22 @@ /* Version number of package */ #undef VERSION +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + +/* Define to 1 if your processor stores words with the least significant byte + first (like Intel and VAX, unlike Motorola and SPARC). */ +#undef WORDS_LITTLEENDIAN + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 index c6a45f80e86..7cefb03d69e 100644 --- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 +++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index 1a2bd926865..3dbc05f57ec 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for LCDF typetools for TeX Live 2.90. +# Generated by GNU Autoconf 2.68 for LCDF typetools for TeX Live 2.92. # # Report bugs to <tex-k@tug.org>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='LCDF typetools for TeX Live' PACKAGE_TARNAME='lcdf-typetools-for-tex-live' -PACKAGE_VERSION='2.90' -PACKAGE_STRING='LCDF typetools for TeX Live 2.90' +PACKAGE_VERSION='2.92' +PACKAGE_STRING='LCDF typetools for TeX Live 2.92' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1338,7 +1338,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 LCDF typetools for TeX Live 2.90 to adapt to many kinds of systems. +\`configure' configures LCDF typetools for TeX Live 2.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1409,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.90:";; + short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.92:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LCDF typetools for TeX Live configure 2.90 +LCDF typetools for TeX Live configure 2.92 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2279,6 +2279,94 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_decl +# ac_fn_cxx_try_run LINENO +# ------------------------ +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_cxx_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run + +# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES +# ----------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_cxx_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_decl + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2460,7 +2548,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 LCDF typetools for TeX Live $as_me 2.90, which was +It was created by LCDF typetools for TeX Live $as_me 2.92, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -7813,7 +7901,7 @@ fi # Define the identity of the package. PACKAGE='lcdf-typetools-for-tex-live' - VERSION='2.90' + VERSION='2.92' cat >>confdefs.h <<_ACEOF @@ -13002,7 +13090,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags -LCDF_TYPETOOLS_VERSION=2.90 +LCDF_TYPETOOLS_VERSION=2.92 ac_config_headers="$ac_config_headers autoconf.h" @@ -17660,7 +17748,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -LCDF typetools for TeX Live config.lt 2.90 +LCDF typetools for TeX Live config.lt 2.92 configured by $0, generated by GNU Autoconf 2.68. Copyright (C) 2010 Free Software Foundation, Inc. @@ -19167,6 +19255,235 @@ done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/param.h> + +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/param.h> + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + +$as_echo "#define WORDS_LITTLEENDIAN 1" >>confdefs.h + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19189,13 +19506,13 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtod works" >&5 -$as_echo_n "checking whether strtod works... " >&6; } -if ${ac_cv_working_strtod+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strtod" >&5 +$as_echo_n "checking for broken strtod... " >&6; } +if ${ac_cv_broken_strtod+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - ac_cv_working_strtod=yes + ac_cv_broken_strtod=no else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19205,29 +19522,105 @@ int main(int c, char **v) { char s[] = "12 "; char *endp; double d = strtod(s, &endp); - exit(*endp == 0 ? 1 : 0); + return (s + 2) == endp; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - ac_cv_working_strtod=yes + ac_cv_broken_strtod=yes else - ac_cv_working_strtod=no + ac_cv_broken_strtod=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_strtod" >&5 -$as_echo "$ac_cv_working_strtod" >&6; } -if test "x$ac_cv_working_strtod" = xno; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strtod" >&5 +$as_echo "$ac_cv_broken_strtod" >&6; } +if test "x$ac_cv_broken_strtod" = xyes; then need_fixlibc=1 -$as_echo "#define BROKEN_STRTOD 1" >>confdefs.h +$as_echo "#define HAVE_BROKEN_STRTOD 1" >>confdefs.h + +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_link="./libtool --mode=link --tag=CXX $ac_link" + +ac_fn_cxx_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" +if test "x$ac_cv_have_decl_strnlen" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNLEN $ac_have_decl +_ACEOF + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_link="./libtool --mode=link --tag=CC $ac_link" + +for ac_func in strnlen +do : + ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +if test "x$ac_cv_func_strnlen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRNLEN 1 +_ACEOF + have_strnlen=1 +else + need_fixlibc=1 +fi +done + +if test "x$have_strnlen" = x1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strnlen" >&5 +$as_echo_n "checking for broken strnlen... " >&6; } +if ${ac_cv_broken_strnlen+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_broken_strnlen=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <string.h> +#include <stdio.h> +int main(int c, char **v) { + char s[] = "01234567891"; + return strnlen(s, 10) == 10; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_strnlen=yes +else + ac_cv_broken_strnlen=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strnlen" >&5 +$as_echo "$ac_cv_broken_strnlen" >&6; } + if test "x$ac_cv_broken_strnlen" = xyes; then + need_fixlibc=1 + +$as_echo "#define HAVE_BROKEN_STRNLEN 1" >>confdefs.h + fi fi -for ac_func in ctime ftruncate mkstemp sigaction strnlen strtoul waitpid +for ac_func in ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20007,6 +20400,7 @@ if test -z "${have_kpathsea_TRUE}" && test -z "${have_kpathsea_FALSE}"; then as_fn_error $? "conditional \"have_kpathsea\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + if test -z "${FIXLIBC_TRUE}" && test -z "${FIXLIBC_FALSE}"; then as_fn_error $? "conditional \"FIXLIBC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20420,7 +20814,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 LCDF typetools for TeX Live $as_me 2.90, which was +This file was extended by LCDF typetools for TeX Live $as_me 2.92, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20486,7 +20880,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LCDF typetools for TeX Live config.status 2.90 +LCDF typetools for TeX Live config.status 2.92 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index 38678afc7a6..490afd71bb7 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -144,30 +144,57 @@ AC_CHECK_HEADERS(new.h unistd.h) dnl -dnl functions such as strerror, working strtod, strtoul, time -dnl headers such as unistd.h +dnl endianness +dnl + +AC_C_BIGENDIAN(, [AC_DEFINE([WORDS_LITTLEENDIAN], 1, [Define to 1 if your processor stores words with the least significant byte + first (like Intel and VAX, unlike Motorola and SPARC).])]) + + +dnl +dnl functions such as strerror, working strtod, working strnlen, strtoul, +dnl time headers such as unistd.h dnl AC_LANG_C need_fixlibc=0 -AC_CHECK_FUNCS(strerror, :, [need_fixlibc=1]) +AC_CHECK_FUNCS([strerror], [:], [need_fixlibc=1]) -AC_CACHE_CHECK(whether strtod works, ac_cv_working_strtod, +AC_CACHE_CHECK([for broken strtod], [ac_cv_broken_strtod], [AC_TRY_RUN([#include <stdio.h> #include <stdlib.h> int main(int c, char **v) { char s[] = "12 "; char *endp; double d = strtod(s, &endp); - exit(*endp == 0 ? 1 : 0); -}], [ac_cv_working_strtod=yes], [ac_cv_working_strtod=no], -[ac_cv_working_strtod=yes])]) -if test "x$ac_cv_working_strtod" = xno; then + return (s + 2) == endp; +}], [ac_cv_broken_strtod=yes], [ac_cv_broken_strtod=no], +[ac_cv_broken_strtod=no])]) +if test "x$ac_cv_broken_strtod" = xyes; then need_fixlibc=1 - AC_DEFINE(BROKEN_STRTOD, 1, [Define if strtod is broken.]) + AC_DEFINE(HAVE_BROKEN_STRTOD, 1, [Define if strtod is broken.]) +fi + +AC_LANG_CPLUSPLUS +AC_CHECK_DECLS([strnlen]) +AC_LANG_C +AC_CHECK_FUNCS([strnlen], [have_strnlen=1], [need_fixlibc=1]) +if test "x$have_strnlen" = x1; then + AC_CACHE_CHECK([for broken strnlen], [ac_cv_broken_strnlen], + [AC_TRY_RUN([#include <string.h> +#include <stdio.h> +int main(int c, char **v) { + char s[] = "01234567891"; + return strnlen(s, 10) == 10; +}], [ac_cv_broken_strnlen=yes], [ac_cv_broken_strnlen=no], +[ac_cv_broken_strnlen=no])]) + if test "x$ac_cv_broken_strnlen" = xyes; then + need_fixlibc=1 + AC_DEFINE([HAVE_BROKEN_STRNLEN], [1], [Define if strnlen is broken.]) + fi fi -AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strnlen strtoul waitpid]) +AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid]) AC_CHECK_FUNC([floor], [:], [AC_CHECK_LIB(m, floor)]) AC_CHECK_FUNC([fabs], [:], [AC_CHECK_LIB(m, fabs)]) AC_CHECK_HEADERS([unistd.h fcntl.h sys/time.h sys/wait.h]) diff --git a/Build/source/texk/lcdf-typetools/configure.ac.orig b/Build/source/texk/lcdf-typetools/configure.ac.orig index c3fd4494eae..8291c068782 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac.orig +++ b/Build/source/texk/lcdf-typetools/configure.ac.orig @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([lcdf-typetools], [2.90]) +AC_INIT([lcdf-typetools], [2.92]) AC_CONFIG_SRCDIR([NEWS]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER([autoconf.h]) @@ -245,30 +245,55 @@ AC_CHECK_HEADERS(new.h unistd.h) dnl -dnl functions such as strerror, working strtod, strtoul, time -dnl headers such as unistd.h +dnl endianness +dnl + +AC_C_BIGENDIAN(, [AC_DEFINE([WORDS_LITTLEENDIAN], 1, [Define to 1 if your processor stores words with the least significant byte + first (like Intel and VAX, unlike Motorola and SPARC).])]) + + +dnl +dnl functions such as strerror, working strtod, working strnlen, strtoul, +dnl time headers such as unistd.h dnl AC_LANG_C need_fixlibc=0 -AC_CHECK_FUNCS(strerror, :, [need_fixlibc=1]) +AC_CHECK_FUNCS([strerror], [:], [need_fixlibc=1]) -AC_CACHE_CHECK(whether strtod works, ac_cv_working_strtod, +AC_CACHE_CHECK([for broken strtod], [ac_cv_broken_strtod], [AC_TRY_RUN([#include <stdio.h> #include <stdlib.h> int main(int c, char **v) { char s[] = "12 "; char *endp; double d = strtod(s, &endp); - exit(*endp == 0 ? 1 : 0); -}], [ac_cv_working_strtod=yes], [ac_cv_working_strtod=no], -[ac_cv_working_strtod=yes])]) -if test "x$ac_cv_working_strtod" = xno; then + return (s + 2) == endp; +}], [ac_cv_broken_strtod=yes], [ac_cv_broken_strtod=no], +[ac_cv_broken_strtod=no])]) +if test "x$ac_cv_broken_strtod" = xyes; then need_fixlibc=1 - AC_DEFINE(BROKEN_STRTOD, 1, [Define if strtod is broken.]) + AC_DEFINE(HAVE_BROKEN_STRTOD, 1, [Define if strtod is broken.]) +fi + +AC_CHECK_DECLS([strnlen]) +AC_CHECK_FUNCS([strnlen], [have_strnlen=1], [need_fixlibc=1]) +if test "x$have_strnlen" = x1; then + AC_CACHE_CHECK([for broken strnlen], [ac_cv_broken_strnlen], + [AC_TRY_RUN([#include <string.h> +#include <stdio.h> +int main(int c, char **v) { + char s[] = "01234567891"; + return strnlen(s, 10) == 10; +}], [ac_cv_broken_strnlen=yes], [ac_cv_broken_strnlen=no], +[ac_cv_broken_strnlen=no])]) + if test "x$ac_cv_broken_strnlen" = xyes; then + need_fixlibc=1 + AC_DEFINE([HAVE_BROKEN_STRNLEN], [1], [Define if strnlen is broken.]) + fi fi -AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strnlen strtoul waitpid]) +AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid]) AC_CHECK_FUNC([floor], [:], [AC_CHECK_LIB(m, floor)]) AC_CHECK_FUNC([fabs], [:], [AC_CHECK_LIB(m, fabs)]) AC_CHECK_HEADERS([unistd.h fcntl.h sys/time.h sys/wait.h]) diff --git a/Build/source/texk/lcdf-typetools/include/config.h b/Build/source/texk/lcdf-typetools/include/config.h index 16831c0a111..90862b448a5 100644 --- a/Build/source/texk/lcdf-typetools/include/config.h +++ b/Build/source/texk/lcdf-typetools/include/config.h @@ -11,6 +11,7 @@ # include <win32lib.h> # endif #else +# include <stddef.h> # define CDECL /* nothing */ #endif @@ -18,14 +19,19 @@ extern "C" { #endif -/* Prototype strerror if we don't have it. */ +/* Prototype strerror if necessary. */ #if !HAVE_STRERROR char *strerror(int errno); #endif -/* Prototype good_strtod if we need it. */ -#if BROKEN_STRTOD -double good_strtod(const char *nptr, char **endptr); +/* Prototype strnlen if necessary. */ +#if !HAVE_STRNLEN || !HAVE_DECL_STRNLEN +size_t strnlen(const char *s, size_t maxlen); +#endif + +/* Prototype good_strtod if necessary. */ +#if HAVE_BROKEN_STRTOD +double good_strtod(const char *s, char **endptr); #endif #ifdef __cplusplus diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-void-func b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-void-func deleted file mode 100644 index c3960ee83da..00000000000 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/patch-01-void-func +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur lcdf-typetools-2.90.orig/include/efont/otfgsub.hh lcdf-typetools-2.90/include/efont/otfgsub.hh ---- lcdf-typetools-2.90.orig/include/efont/otfgsub.hh 2011-06-02 08:42:13.000000000 +0200 -+++ lcdf-typetools-2.90/include/efont/otfgsub.hh 2011-06-14 09:38:45.000000000 +0200 -@@ -99,7 +99,7 @@ - enum { F3_HSIZE = 6, SUBRECSIZE = 4 }; - private: - Data _d; -- static bool f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap); -+ static void f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap); - static bool f3_unparse(const Data &data, - int nglyph, int glyphtab_offset, const Coverage &limit, - int nsub, int subtab_offset, -diff -ur lcdf-typetools-2.90.orig/libefont/otfgsub.cc lcdf-typetools-2.90/libefont/otfgsub.cc ---- lcdf-typetools-2.90.orig/libefont/otfgsub.cc 2011-06-02 08:57:48.000000000 +0200 -+++ lcdf-typetools-2.90/libefont/otfgsub.cc 2011-06-14 09:38:54.000000000 +0200 -@@ -1070,7 +1070,7 @@ - return Coverage(); - } - --bool -+void - GsubContext::f3_mark_out_glyphs(const Data &data, int nsub, int subtab_offset, const Gsub &gsub, Vector<bool> &gmap) - { - for (int j = 0; j < nsub; ++j) { diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog index 6bfd1b0e084..f46a2ad6def 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/ChangeLog +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2011-06-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import lcdf-typetools-2.92. + * version.ac: Adapt. + * patch-01-void-func (removed): Now distributed. + 2011-06-14 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-01-void-func (new): Patch from diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes index 996609dcb28..09e2d8d9558 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.90-PATCHES/TL-Changes +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes @@ -1,5 +1,5 @@ Changes applied to the lcdf-typetools tree as obtained from: - http://www.lcdf.org/type/lcdf-typetools-2.90.tar.gz + http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz Removed: depcomp diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec index 3f2e6b6e437..0a378a616f7 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec @@ -1,6 +1,6 @@ Summary: Programs to manipulate OpenType and multiple-master fonts Name: lcdf-typetools -Version: 2.90 +Version: 2.92 Copyright: GPL Vendor: Little Cambridgeport Design Factory <http://www.lcdf.org/> Group: Utilities/Printing diff --git a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc index e3cd55689b8..f4a731f832f 100644 --- a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc +++ b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc @@ -24,7 +24,7 @@ #include <stdarg.h> #include <ctype.h> #include <stdlib.h> -#ifdef BROKEN_STRTOD +#if HAVE_BROKEN_STRTOD # define strtod good_strtod #endif namespace Efont { diff --git a/Build/source/texk/lcdf-typetools/libefont/t1item.cc b/Build/source/texk/lcdf-typetools/libefont/t1item.cc index 3c405b2f3f7..d6f133045e0 100644 --- a/Build/source/texk/lcdf-typetools/libefont/t1item.cc +++ b/Build/source/texk/lcdf-typetools/libefont/t1item.cc @@ -27,7 +27,7 @@ #ifndef WIN32 # include <unistd.h> #endif -#ifdef BROKEN_STRTOD +#if HAVE_BROKEN_STRTOD # define strtod good_strtod #endif namespace Efont { diff --git a/Build/source/texk/lcdf-typetools/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/liblcdf/error.cc index 03b1e27269c..54339c8a4a6 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/error.cc +++ b/Build/source/texk/lcdf-typetools/liblcdf/error.cc @@ -486,14 +486,8 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val) int len; if (precision < 0) len = strlen(s1); - else { -#if HAVE_STRNLEN + else len = strnlen(s1, precision); -#else - for (len = 0; len < precision && s1[len] != 0; ++len) - /* do nothing */; -#endif - } // transform string if alternate form if (flags & cf_alternate_form) { diff --git a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c index 5d0b831c613..d41238daf85 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c +++ b/Build/source/texk/lcdf-typetools/liblcdf/fixlibc.c @@ -10,38 +10,38 @@ extern "C" { #endif -#ifndef HAVE_STRDUP +#if !HAVE_STRDUP char * strdup(const char *s) { - char *t; - int l; - if (!s) - return 0; - l = strlen(s) + 1; - t = (char *)malloc(l); - if (!t) - return 0; - memcpy(t, s, l); - return t; + char *t; + int l; + if (!s) + return 0; + l = strlen(s) + 1; + t = (char *)malloc(l); + if (!t) + return 0; + memcpy(t, s, l); + return t; } #endif -#ifndef HAVE_STRERROR +#if !HAVE_STRERROR /* David Mazieres <dm@lcs.mit.edu> assures me that this definition works. */ char * strerror(int errno) { - extern int sys_nerr; - extern char *sys_errlist[]; - if (errno < 0 || errno >= sys_nerr) - return (char *)"bad error number"; - else - return sys_errlist[errno]; + extern int sys_nerr; + extern char *sys_errlist[]; + if (errno < 0 || errno >= sys_nerr) + return (char *)"bad error number"; + else + return sys_errlist[errno]; } #endif -#ifdef BROKEN_STRTOD +#if HAVE_BROKEN_STRTOD /* On NeXTSTEP, Melissa O'Neill <oneill@cs.sfu.ca> reports that strtod consumes whitespace after its argument, which makes mminstance (among other programs) not work. This wrapper gets rid of that whitespace again. @@ -51,11 +51,20 @@ strerror(int errno) double good_strtod(const char *nptr, char **endptr) { - double d = strtod(nptr, endptr); - if (endptr) - while (*endptr > nptr && isspace((unsigned char) (*endptr)[-1])) - (*endptr)--; - return d; + double d = strtod(nptr, endptr); + if (endptr) + while (*endptr > nptr && isspace((unsigned char) (*endptr)[-1])) + (*endptr)--; + return d; +} +#endif + +#if !HAVE_STRNLEN || HAVE_BROKEN_STRNLEN +size_t +strnlen(const char *s, size_t maxlen) +{ + const char *p = (const char *) memchr(s, 0, maxlen); + return p ? p - s : maxlen; } #endif diff --git a/Build/source/texk/lcdf-typetools/liblcdf/md5.c b/Build/source/texk/lcdf-typetools/liblcdf/md5.c index d2373dc6120..8a45ee8b87a 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/md5.c +++ b/Build/source/texk/lcdf-typetools/liblcdf/md5.c @@ -46,7 +46,7 @@ extern "C" { /**************** - * Rotate a 32 bit integer by n bytes + * Rotate a 32 bit integer by n bits */ #if defined(__GNUC__) && defined(__i386__) static inline uint32_t diff --git a/Build/source/texk/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/liblcdf/string.cc index b221f7aefcd..915121e443c 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/string.cc +++ b/Build/source/texk/lcdf-typetools/liblcdf/string.cc @@ -610,10 +610,12 @@ String::hashcode(const char *begin, const char *end) #undef get16 #if !HAVE_INDIFFERENT_ALIGNMENT } else { -# if !__i386__ +# if WORDS_BIGENDIAN # define get16(p) (((unsigned char) (p)[0] << 8) + (unsigned char) (p)[1]) -# else +# elif WORDS_LITTLEENDIAN # define get16(p) ((unsigned char) (p)[0] + ((unsigned char) (p)[1] << 8)) +# else +# error "unknown byte order" # endif // should be exactly the same as the code above for (; begin != end; begin += 4) { diff --git a/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c b/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c index b4bad23241d..36898c5a7ad 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c +++ b/Build/source/texk/lcdf-typetools/liblcdf/strtonum.c @@ -4,7 +4,7 @@ #endif #include <lcdf/strtonum.h> #include <stdlib.h> -#ifdef BROKEN_STRTOD +#if HAVE_BROKEN_STRTOD # define strtod good_strtod #endif #ifdef __cplusplus diff --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 index a06bd93be61..82942ad329e 100644 --- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 +++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 @@ -1,5 +1,5 @@ .\" -*-nroff-*- -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 index 8a68d6d7729..850be8e85f8 100644 --- a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 +++ b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 @@ -1,5 +1,5 @@ .\" -*-nroff-*- -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 index 1769b600e55..c3f76691c5b 100644 --- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 +++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 @@ -1,5 +1,5 @@ '\"t -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 index 3314b3cdaad..d83263f40b4 100644 --- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 +++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 @@ -1,5 +1,5 @@ '\"t -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. @@ -1207,7 +1207,7 @@ Small-capital version of "FL" FFIsmall Small-capital version of "FFI" .TP -FFIsmall +FFLsmall Small-capital version of "FFL" .PD ' diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 index 13cd295da88..779914d281f 100644 --- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 +++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 index 428fe44b88c..bebd5fec146 100644 --- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 +++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 index 84afb78915b..15925e273c3 100644 --- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 +++ b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 index 62dc13c22df..a5a6d98a06c 100644 --- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 +++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 index 46fe5bc1ba7..d9b328cc24c 100644 --- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 +++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 index 0847b605516..9a63e69ac09 100644 --- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 +++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 @@ -1,4 +1,4 @@ -.ds V 2.90 +.ds V 2.92 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac index 431cbab27a4..4d356a0d765 100644 --- a/Build/source/texk/lcdf-typetools/version.ac +++ b/Build/source/texk/lcdf-typetools/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current lcdf-typetools version -m4_define([lcdf_typetools_version], [2.90]) +m4_define([lcdf_typetools_version], [2.92]) |