From 88542504827505fefe89d2a3547e92146ceb943d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 20 Mar 2009 11:05:11 +0000 Subject: new build system git-svn-id: svn://tug.org/texlive/trunk@12466 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure.in | 287 ----------- Build/source/libs/configure.in | 84 ---- Build/source/texk/configure.in | 57 --- Build/source/texk/web2c/Makefile.in | 5 +- .../texk/web2c/luatexdir/luafontforge/ChangeLog | 5 + .../texk/web2c/luatexdir/luafontforge/ff-config.in | 47 ++ Build/source/texk/web2c/omegafonts/pl-parser.y | 544 +++++++++++++++++++++ Build/source/texk/web2c/omegafonts/pl.y | 544 --------------------- Build/source/texk/web2c/pdftexdir/.indent.pro | 12 - Build/source/texk/web2c/pdftexdir/Makefile.in | 71 --- Build/source/texk/web2c/pdftexdir/am/pdftex.am | 4 +- Build/source/texk/web2c/pdftexdir/depend.mk | 55 --- Build/source/texk/xdvipdfmx/src/Makefile.am.orig | 45 ++ Build/source/utils/ps2eps/Makefile.in.orig | 53 ++ Build/source/utils/ps2eps/configure.in | 9 - Build/source/utils/vlna/ac/withenable.ac | 3 + 16 files changed, 700 insertions(+), 1125 deletions(-) delete mode 100644 Build/source/configure.in delete mode 100644 Build/source/libs/configure.in delete mode 100644 Build/source/texk/configure.in create mode 100644 Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog create mode 100644 Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in create mode 100644 Build/source/texk/web2c/omegafonts/pl-parser.y delete mode 100644 Build/source/texk/web2c/omegafonts/pl.y delete mode 100644 Build/source/texk/web2c/pdftexdir/.indent.pro delete mode 100644 Build/source/texk/web2c/pdftexdir/Makefile.in delete mode 100644 Build/source/texk/web2c/pdftexdir/depend.mk create mode 100644 Build/source/texk/xdvipdfmx/src/Makefile.am.orig create mode 100644 Build/source/utils/ps2eps/Makefile.in.orig delete mode 100644 Build/source/utils/ps2eps/configure.in create mode 100644 Build/source/utils/vlna/ac/withenable.ac (limited to 'Build/source') diff --git a/Build/source/configure.in b/Build/source/configure.in deleted file mode 100644 index 35e69aaf613..00000000000 --- a/Build/source/configure.in +++ /dev/null @@ -1,287 +0,0 @@ -dnl Top-level configure for TeX Live build. Public domain. - -AC_INIT(texk/make/common.mk) - -AC_CONFIG_AUX_DIR(config) -AC_PROG_MAKE_SET -AC_PROG_CC -AC_PROG_CXX - -AC_PROG_LEX -case $LEX in - lex) - OLDIFS=$IFS; IFS=: - foundLEX=false - for p in $PATH; do - if test -f "$p/lex"; then - foundLEX=true - break - fi - done - IFS=$OLDIFS - ;; -esac -if $foundLEX; then :; else - AC_MSG_ERROR(no working lexical scanner (lex/flex) found) -fi - -AC_PROG_YACC -case $YACC in - yacc) - OLDIFS=$IFS; IFS=: - foundYACC=false - for p in $PATH; do - if test -f "$p/yacc"; then - foundYACC=true - break - fi - done - IFS=$OLDIFS - ;; -esac -if $foundYACC; then :; else - AC_MSG_ERROR(no working parser generator (yacc/bison) found) -fi - -AC_CANONICAL_SYSTEM - -dnl Various compiler directives -AC_MSG_CHECKING(whether to define additional compiler specific flags) -case "$target" in - alpha*-dec*) - if test "$CC" = "cc"; then - CFLAGS="$CFLAGS -Olimit 1000 -std1"; export CFLAGS - AC_MSG_WARN(Digital Unix's cc) - fi - ;; - hp*hpux*) - if test "$CC" = "cc"; then - CFLAGS="$CFLAGS -Aa +e -D_HPUX_SOURCE"; export CFLAGS - AC_MSG_WARN(HP-UX's cc) - fi - ;; - *-darwin*) - : ${INSTALL='/usr/bin/install -c -p'}; export INSTALL - : ${NCURSES_CPP_FIX=true}; export NCURSES_CPP_FIX - AC_MSG_RESULT([no, but using other fixes for Darwin]) - ;; - *) - AC_MSG_RESULT(no) - ;; -esac - -dnl We check this here, because otherwise some worse check (from ncurses?) -dnl is used instead for the cached value. -AC_HEADER_SYS_WAIT - -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S -AC_FUNC_ALLOCA -AC_PROG_RANLIB -AC_PATH_X - -dnl These are included for compilation with either teTeX or standalone xdvik -dnl (tetex will only provide tetex.ac, xdvik only xdvik.ac) -sinclude(tetex.ac) -sinclude(texlive.ac) -sinclude(xdvik.ac) -sinclude(withenable.ac) -sinclude(utils/dialog/withenable.ac) -sinclude(texk/withenable.ac) -sinclude(texk/kpathsea/xt.ac) -sinclude(texk/kpathsea/withenable.ac) -sinclude(texk/web2c/withenable.ac) -sinclude(texk/web2c/xetexdir/withenable.ac) -sinclude(texk/xdvik/withenable.ac) -sinclude(libs/ncurses/withenable.ac) -sinclude(libs/zlib/withenable.ac) -sinclude(libs/libpng/withenable.ac) -sinclude(libs/t1lib/withenable.ac) -sinclude(libs/freetype/withenable.ac) -sinclude(libs/freetype2/withenable.ac) -sinclude(libs/gd/withenable.ac) -sinclude(libs/icu-xetex/withenable.ac) -sinclude(libs/teckit/withenable.ac) -sinclude(libs/graphite-engine/withenable.ac) - -NCURSESDIR=libs/ncurses -LIBT1DIR=libs/t1lib -LIBTYPE1DIR=libs/type1 -LIBPNGDIR=libs/libpng -ZLIBDIR=libs/zlib -LIBXPDFDIR=libs/xpdf -FREETYPEDIR=libs/freetype -FREETYPE2DIR=libs/freetype2 -ICUDIR=libs/icu-xetex -GRAPHITEDIR=libs/graphite-engine -TECKITDIR=libs/teckit -GDDIR=libs/gd -LIBOBSDCOMPATDIR=libs/obsdcompat - -test "$no_x" = yes && { with_xdvik=no; with_oxdvik=no; } -export with_xdvik with_oxdvik - -# we need libt1 for dvipng, xdvik, oxdvik -test ! -d $srcdir/$LIBT1DIR && : ${needs_libt1=no} -test "$with_dvipng" != no && : ${needs_libt1=yes} -test "$with_xdvik" != no && : ${needs_libt1=yes} -test "$with_oxdvik" != no && : ${needs_libt1=yes} -: ${needs_libt1=no} -export needs_libt1 - -# we need ncurses for dialog -test ! -d $srcdir/$NCURSESDIR && : ${needs_ncurses=no} -test "$with_dialog" != no && : ${needs_ncurses=yes} -: ${needs_ncurses=no} -export needs_ncurses - -# we need pnglib for dvipng, pdf[ex]tex, xetex, dvipdfm, dvipdfmx, xdvipdfmx -test ! -d $srcdir/$LIBPNGDIR && : ${needs_pnglib=no} -test "$with_dvipng" != no && : ${needs_pnglib=yes} -test "$with_pdftex" != no && : ${needs_pnglib=yes} -test "$with_pdfetex" != no && : ${needs_pnglib=yes} -test "$with_xetex" != no && : ${needs_pnglib=yes} -test "$with_dvipdfm" != no && : ${needs_pnglib=yes} -test "$with_dvipdfmx" != no && : ${needs_pnglib=yes} -test "$with_xdvipdfmx" != no && : ${needs_pnglib=yes} -: ${needs_pnglib=no} -export needs_pnglib - -# we need zlib for dvipng, pdf[ex]tex, xetex, dvipdfm, etc. -test ! -d $srcdir/$ZLIBDIR && : ${needs_zlib=no} -test "$with_dvipng" != no && : ${needs_zlib=yes} -test "$with_pdftex" != no && : ${needs_zlib=yes} -test "$with_pdfetex" != no && : ${needs_zlib=yes} -test "$with_xetex" != no && : ${needs_zlib=yes} -test "$with_dvipdfm" != no && : ${needs_zlib=yes} -test "$with_dvipdfmx" != no && : ${needs_zlib=yes} -test "$with_xdvipdfmx" != no && : ${needs_zlib=yes} -: ${needs_zlib=no} -export needs_zlib - -# we need libxpdf for pdf[ex]tex, xetex -test ! -d $srcdir/$LIBXPDFDIR && : ${needs_libxpdf=no} -test "$with_pdftex" != no && : ${needs_libxpdf=yes} -test "$with_pdfetex" != no && : ${needs_libxpdf=yes} -test "$with_xetex" != no && : ${needs_libxpdf=yes} -: ${needs_libxpdf=no} -export needs_libxpdf - -# we need libobsdcompat for pdftex -test ! -d $srcdir/$LIBOBSDCOMPATDIR && : ${needs_obsdcompat=no} -test "$with_pdftex" != no && : ${needs_obsdcompat=yes} -test "$with_pdfetex" != no && : ${needs_obsdcompat=yes} -: ${needs_obsdcompat=no} -export needs_obsdcompat - -# we need gd for dvipng -test ! -d $srcdir/$GDDIR && : ${needs_gd=no} -test "$with_dvipng" != no && : ${needs_gd=yes} -: ${needs_gd=no} -export needs_gd - -# we need freetype for ttf2pk -test ! -d $srcdir/$FREETYPEDIR && : ${needs_freetype=no} -test ! -d $srcdir/texk/ttf2pk && : ${needs_freetype=no} -test "$with_ttf2pk" = no && : ${needs_freetype=no} -: ${needs_freetype=yes} -export needs_freetype - -# we need freetype2 for xetex, xdvipdfmx, dvipng -test ! -d $srcdir/$FREETYPE2DIR && : ${needs_freetype2=no} -test "$with_xetex" != no && : ${needs_freetype2=yes} -test "$with_xdvipdfmx" != no && : ${needs_freetype2=yes} -test "$with_dvipng" != no && : ${needs_freetype2=yes} -: ${needs_freetype2=no} -export needs_freetype2 - -# we need icu for xetex -test ! -d $srcdir/$ICUDIR && : ${needs_icu=no} -test "$with_xetex" != no && : ${needs_icu=yes} -: ${needs_icu=no} -export needs_icu - -# we need graphite for xetex, unless specifically disabled -test ! -d $srcdir/$GRAPHITEDIR && : ${needs_graphite=no} -test "$with_graphite" = no && : ${needs_graphite=no} -test "$with_xetex" != no && : ${needs_graphite=yes} -: ${needs_graphite=no} -export needs_graphite - -# we need teckit for xetex -test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no} -test "$with_xetex" != no && : ${needs_teckit=yes} -: ${needs_teckit=no} -export needs_teckit - -dnl We cannot use variables (e.g. $LIBPNGDIR) for sinclude, so... -sinclude(libs/ncurses/ncurses.ac) -sinclude(libs/zlib/zlib.ac) -sinclude(libs/libpng/libpng.ac) -sinclude(libs/xpdf/libxpdf.ac) -sinclude(libs/t1lib/t1lib.ac) -sinclude(libs/freetype/freetype.ac) -sinclude(libs/freetype2/freetype2.ac) -sinclude(libs/gd/gd.ac) -sinclude(libs/icu-xetex/icu-xetex.ac) -sinclude(libs/graphite-engine/graphite-engine.ac) -sinclude(libs/teckit/teckit.ac) -sinclude(libs/obsdcompat/libobsd-compat.ac) - -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $GRAPHITEDEP $TECKITDEP $LIBOBSDDEP" - -LIBSDIRS= -test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \ - && LIBSDIRS="$LIBSDIRS $NCURSESDIR" -test "$needs_zlib" = yes && test "$using_system_zlib" != yes \ - && LIBSDIRS="$LIBSDIRS $ZLIBDIR" -test "$needs_pnglib" = yes && test "$using_system_pnglib" != yes \ - && LIBSDIRS="$LIBSDIRS $LIBPNGDIR" -test "$needs_libxpdf" = yes \ - && LIBSDIRS="$LIBSDIRS $LIBXPDFDIR" -test "$needs_libt1" = yes && test "$using_system_t1lib" != yes \ - && LIBSDIRS="$LIBSDIRS $LIBT1DIR $LIBTYPE1DIR" -test "$needs_freetype" = yes && test "$using_system_freetype" != yes \ - && LIBSDIRS="$LIBSDIRS $FREETYPEDIR" -test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \ - && LIBSDIRS="$LIBSDIRS $FREETYPE2DIR" -test "$needs_gd" = yes && test "$using_system_gd" != yes \ - && LIBSDIRS="$LIBSDIRS $GDDIR" -test "$needs_icu" = yes && test "$using_system_icu" != yes \ - && LIBSDIRS="$LIBSDIRS $ICUDIR" -test "$needs_teckit" = yes \ - && LIBSDIRS="$LIBSDIRS $TECKITDIR" -test "$needs_graphite" = yes \ - && LIBSDIRS="$LIBSDIRS $GRAPHITEDIR" -test "$needs_obsdcompat" = yes \ - && LIBSDIRS="$LIBSDIRS $LIBOBSDCOMPATDIR" - -dnl required subdir -AC_CONFIG_SUBDIRS([libs]) - -dnl optional subdirs in utils/ => ESUBDIRS -KPSE_CONFIG_SUBDIRS(kpse_utils_pkglist, [utils]) - -AC_SUBST(LIBSDEP) -AC_SUBST(LIBSDIRS) - -# initialize texmf tree with fmtutil only for teTeX and TeX Live -if test ! -d $srcdir/texk/tetex || test -n "$xdvik_standalone" || test "x$cross_compiling" = xyes; then - FMU= -else - FMU='# ' -fi -AC_SUBST(FMU) - -# more customizations for standalone xdvik -if test -z "$xdvik_standalone"; then - INSTDIRS='$(ESUBDIRS)' -else - INSTDIRS=texk/xdvik -fi -AC_SUBST(INSTDIRS) - -AC_CONFIG_SUBDIRS([texk]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/libs/configure.in b/Build/source/libs/configure.in deleted file mode 100644 index 08d22036d5d..00000000000 --- a/Build/source/libs/configure.in +++ /dev/null @@ -1,84 +0,0 @@ -dnl configure.in for TeX Live source/libs. -dnl Public domain. -AC_INIT(zlib/zlib.h) - -AC_CONFIG_AUX_DIR(../config) -AC_PROG_MAKE_SET -AC_PROG_CC -AC_CANONICAL_SYSTEM -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S -AC_FUNC_ALLOCA -AC_PROG_RANLIB -AM_MAINTAINER_MODE - -sinclude(../texk/kpathsea/withenable.ac) -sinclude(ncurses/withenable.ac) -sinclude(ncurses/ncurses.ac) -sinclude(zlib/withenable.ac) -sinclude(zlib/zlib.ac) -sinclude(libpng/withenable.ac) -sinclude(libpng/libpng.ac) -sinclude(t1lib/withenable.ac) -sinclude(t1lib/t1lib.ac) -sinclude(freetype/withenable.ac) -sinclude(freetype/freetype.ac) -sinclude(freetype2/withenable.ac) -sinclude(freetype2/freetype2.ac) -sinclude(gd/withenable.ac) -sinclude(gd/gd.ac) -sinclude(icu-xetex/withenable.ac) -sinclude(icu-xetex/icu-xetex.ac) -sinclude(teckit/teckit.ac) -sinclude(graphite-engine/withenable.ac) -sinclude(graphite-engine/graphite-engine.ac) - -# The following line helps, e.g. for ncurses which properly detects the -# system's terminfo definitions if configured without explicit --prefix. -# ac_configure_args=`echo "$ac_configure_args" | sed 's@--prefix=[[^ ]]*@@'` - -if test "x$needs_ncurses" != xno && test "$using_system_ncurses" != yes; then - AC_CONFIG_SUBDIRS([ncurses]) -fi -if test "x$needs_zlib" != xno && test "$using_system_zlib" != yes; then - KPSE_CONFIG_FILES([zlib/Makefile]) -fi -if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then - KPSE_CONFIG_FILES([libpng/Makefile]) -fi -if test "x$needs_libxpdf" != xno; then - AC_CONFIG_SUBDIRS([xpdf]) -fi -if test "x$needs_libt1" != xno && test "$using_system_t1lib" != yes; then - AC_CONFIG_SUBDIRS([t1lib type1]) -fi -if test "x$needs_freetype" != xno && test "$using_system_freetype" != yes; then - AC_CONFIG_SUBDIRS([freetype]) -fi -if test "x$needs_freetype2" != xno && test "$using_system_freetype2" != yes; then - AC_CONFIG_SUBDIRS([freetype2]) -fi -if test "x$needs_gd" != xno && test "$using_system_gd" != yes; then - AC_CONFIG_SUBDIRS([gd]) -fi -if test "x$needs_icu" != xno && test "$using_system_icu" != yes; then - ac_configure_args="$ac_configure_args --enable-static" - AC_CONFIG_SUBDIRS([icu-xetex]) -fi -if test "x$needs_teckit" != xno; then - AC_CONFIG_SUBDIRS([teckit]) -fi -if test "x$needs_graphite" != xno; then - AC_CONFIG_SUBDIRS([graphite-engine]) -fi -if test "x$needs_obsdcompat" != xno; then - AC_CONFIG_SUBDIRS([obsdcompat]) -fi - -# create md5 directory when building outside the srcdir: -if test -d $srcdir/md5; then - test -d md5 || mkdir md5 -fi - -AC_OUTPUT diff --git a/Build/source/texk/configure.in b/Build/source/texk/configure.in deleted file mode 100644 index 8c7cf884b9e..00000000000 --- a/Build/source/texk/configure.in +++ /dev/null @@ -1,57 +0,0 @@ -dnl Public domain. Originally written many years ago by Karl Berry and -dnl Thomas Esser, and others. -dnl -dnl Top-level configure for kpathsea-using programs. -dnl Our job is to run configure in the relevant subdirectories. -dnl -dnl Assumption: each program will create a c-auto.h that defines -dnl everything kpathsea needs. We arrange this by including (at -dnl autoconf time) kpathsea/common.ac. -dnl -dnl Consequence: we don't need to run configure in the kpathsea directory -dnl itself; we can just copy from a program directory. We'll use the -dnl first one. -dnl -AC_INIT(kpathsea/kpathsea.texi) - -dnl These configure scripts won't work with anything else. -AC_PREREQ(2.59) - -AC_PROG_MAKE_SET - -dnl Because we include make/common.make. -AC_PROG_CC -AC_ISC_POSIX -AC_PROG_LN_S - -dnl If we guessed the prefix in the subdirectories, it might guess -dnl differently than the prefix here, and that would cause confusion. -AC_PREFIX_PROGRAM(tex) - -dnl Pass this down from the top level so that when the subprograms -dnl install kpathsea a command line value is propagated. -AC_PROG_INSTALL - -dnl If the other programs ever acquire their own --with or --enable -dnl options, they must be added, so configure --help at the top level -dnl will show all the options. -sinclude(libtool.m4) -sinclude(withenable.ac) -sinclude(kpathsea/withenable.ac) -sinclude(web2c/withenable.ac) -sinclude(xdvik/withenable.ac) - -AC_PROG_LIBTOOL - -if test "x$with_x" = xno; then - with_xdvik=no -fi - -dnl required subdirs -AC_CONFIG_SUBDIRS([kpathsea web2c]) - -dnl optional subdirs => ESUBDIRS -KPSE_CONFIG_SUBDIRS(kpse_texk_pkglist) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 9a5f0e52e45..26c334d2c3d 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -776,9 +776,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \ pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \ pdftexdir/README pdftexdir/change-files.txt \ - pdftexdir/.indent.pro pdftexdir/pdftex.mak \ - pdftexdir/Makefile.in.orig pdftexdir/pdftex.mk \ - pdftexdir/pdftexlib.mk $(luatex_sources) \ + pdftexdir/pdftex.mak pdftexdir/Makefile.in.orig \ + pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk $(luatex_sources) \ luatexdir/luatex.defines luatexdir/luatexextra.in \ luatexdir/ptexlib.h $(luatangle_sources) \ luatexdir/lua51/Makefile luatexdir/lua51/lua.c \ diff --git a/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog b/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog new file mode 100644 index 00000000000..b21d051c62b --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafontforge/ChangeLog @@ -0,0 +1,5 @@ +2009-03-05 Peter Breitenlohner + + * ff-config.in: new configuration header replacing lots of + defines on the command line. + * fontforge/fontforge/configure-pfaedit.h: include ff-config.h. diff --git a/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in b/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in new file mode 100644 index 00000000000..786eb5fe54c --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luafontforge/ff-config.in @@ -0,0 +1,47 @@ +/* @configure_input@ */ + +/* Guard against double inclusion. */ +#ifndef FF_CONFIG_H +#define FF_CONFIG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LANGINFO_H + +/* Define to 1 if the system has the type `long double'. */ +#undef HAVE_LONG_DOUBLE + +/* Define to 1 if the system has the type `long long int'. */ +#undef HAVE_LONG_LONG_INT + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_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 ANSI C header files. */ +#undef STDC_HEADERS + +#ifdef HAVE_LONG_LONG_INT +# define _HAS_LONGLONG 1 +#endif + +#endif /* !FF_CONFIG_H */ diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.y b/Build/source/texk/web2c/omegafonts/pl-parser.y new file mode 100644 index 00000000000..2833db377cd --- /dev/null +++ b/Build/source/texk/web2c/omegafonts/pl-parser.y @@ -0,0 +1,544 @@ +%{ +/* pl.y: Grammar for reading property list files + +This file is part of Omega, +which is based on the web2c distribution of TeX, + +Copyright (c) 1994--2001 John Plaice and Yannis Haralambous + +Omega is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +Omega is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Omega; if not, write to the Free Software Foundation, Inc., +59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + +*/ + +#include "cpascal.h" +#include "parser.h" +#include "manifests.h" +#include "list_routines.h" +#include "error_routines.h" +#include "out_routines.h" +#include "char_routines.h" +#include "header_routines.h" +#include "param_routines.h" +#include "dimen_routines.h" +#include "ligkern_routines.h" +#include "print_routines.h" +#include "font_routines.h" +#include "extra_routines.h" + +%} + +/* Basic tokens */ + +%token LEFT +%token RIGHT +%token NUMBER +%token FIX +%token COMMENT + +/* Tokens found in PL, OPL, VF and OVF files */ + +%token CHECKSUM +%token DESIGNSIZE +%token DESIGNUNITS +%token CODINGSCHEME /* implicit string */ +%token FAMILY /* implicit string */ +%token FACE +%token SEVENBITSAFEFLAG /* implicit 0 (FALSE) or 1 (TRUE) */ +%token HEADER +%token FONTDIMEN +%token LIGTABLE +%token BOUNDARYCHAR +%token CHARACTER + +%token NAMEDPARAMETER /* implicit integer */ +%token PARAMETER + +%token CHARMEASURE /* implicit integer */ +%token NEXTLARGER +%token VARCHAR +%token EXTEN /* implicit integer */ + +%token LABEL +%token LIG /* implicit integer */ +%token KRN +%token STOP +%token SKIP + +/* Tokens found only in VF and OVF files */ + +%token VTITLE + +%token MAPFONT +%token FONTNAME +%token FONTAREA +%token FONTCHECKSUM +%token FONTAT +%token FONTDSIZE + +%token MAP +%token SELECTFONT +%token SETCHAR +%token SETRULE +%token MOVE +%token PUSH +%token POP +%token SPECIAL +%token SPECIALHEX + +/* Tokens found only in OPL and OVF files */ + +%token CHARREPEAT +%token FONTIVALUE +%token FONTFVALUE +%token FONTMVALUE +%token FONTPENALTY +%token FONTRULE +%token FONTGLUE + +%token CLABEL +%token CKRN +%token CGLUE +%token CPENALTY +%token CPENGLUE + +%token CHARIVALUE +%token CHARFVALUE +%token CHARMVALUE +%token CHARPENALTY +%token CHARRULE +%token CHARGLUE + +%token IVALUE +%token IVALUEVAL + +%token MVALUE +%token MVALUEVAL + +%token FVALUE +%token FVALUEVAL + +%token PENALTY +%token PENALTYVAL + +%token RULE +%token RULEMEASURE + +%token GLUE +%token GLUEWD +%token GLUETYPE +%token GLUEKIND /* Implicit integer */ +%token GLUERULE +%token GLUECHAR +%token GLUESHRINKSTRETCH +%token GLUEORDER /* Implicit integer */ + + +%token OFMLEVEL +%token FONTDIR +%token ACCENT + +%% + +File: + Entries +; + +Entries : + /* */ +| Entries + LEFT OneEntry RIGHT +; + +OneEntry : + +/* The following entries are found in PL, OPL, VP and OVP files */ + + CHECKSUM NUMBER + { set_check_sum($2.yint); } +| DESIGNSIZE FIX + { set_design_size($2.yfix); } +| DESIGNUNITS FIX + { set_design_units($2.yfix); } +| CODINGSCHEME + { set_coding_scheme($1.ystring); } +| FAMILY + { set_family($1.ystring); } +| FACE NUMBER + { set_face($2.yint); } +| SEVENBITSAFEFLAG + { set_seven_bit_safe_flag($1.yint); } +| HEADER NUMBER NUMBER + { set_header_word($2.yint, $3.yint); } +| FONTDIMEN + { init_parameters(); } + FontParameters +| LIGTABLE + { init_ligkern(); } + LigKernEntries +| BOUNDARYCHAR NUMBER + { set_boundary_character($2.yint); } +| CHARACTER NUMBER + { init_character($2.yint, NULL); } + CharacterEntries +| COMMENT + +/* The following entries are found only in VP and OVP files */ + +| VTITLE + { set_vtitle($1.ystring); } +| MAPFONT NUMBER + { init_map_font($2.yint); } + MapFontEntries + +/* The following entries are found only in OPL and OVP files */ + +| OFMLEVEL NUMBER + { set_ofm_level($2.yint); } +| FONTDIR + { set_font_dir($1.yint); } +| CHARREPEAT NUMBER NUMBER + { init_character($2.yint,NULL); } + CharacterEntries + { copy_characters($2.yint,$3.yint); } +| FONTIVALUE NUMBER + {init_font_ivalue($2.yint);} + FontIvalueEntries +| FONTMVALUE NUMBER + { init_font_mvalue($2.yint);} + FontMvalueEntries +| FONTFVALUE NUMBER + { init_font_fvalue($2.yint);} + FontFvalueEntries +| FONTPENALTY NUMBER + { init_font_penalty($2.yint);} + FontPenaltyEntries +| FONTRULE NUMBER + { init_font_rule($2.yint);} + FontRuleEntries +| FONTGLUE NUMBER + { init_font_glue($2.yint);} + FontGlueEntries +; + +FontParameters : + /* */ +| FontParameters + LEFT OneFontParameter RIGHT +; + +OneFontParameter : + NAMEDPARAMETER FIX + { set_param_word($1.yint, $2.yfix); } +| PARAMETER NUMBER FIX + { set_param_word($2.yint, $3.yfix); } +| COMMENT +; + +LigKernEntries : + /* */ +| LigKernEntries + LEFT OneLigKernEntry RIGHT +; + +OneLigKernEntry : + LABEL NUMBER + { set_label_command($2.yint); } +| LABEL BOUNDARYCHAR + { set_label_command(CHAR_BOUNDARY); } +| LIG NUMBER NUMBER + { set_ligature_command($1.yint, $2.yint, $3.yint); } +| KRN NUMBER FIX + { set_kerning_command($2.yint, $3.yfix); } +| STOP + { set_stop_command(); } +| SKIP NUMBER + { set_skip_command($2.yint); } +| COMMENT + +/* The following entries are found only in OPL and OVP files */ + +| CLABEL NUMBER + { set_c_label_command($2.yint); } +| CKRN NUMBER FIX + { set_c_kerning_command($2.yint, $3.yfix); } +| CGLUE NUMBER NUMBER + { set_c_glue_command($2.yint, $3.yint); } +| CPENALTY NUMBER NUMBER + { set_c_penalty_command($2.yint, $3.yint); } +| CPENGLUE NUMBER NUMBER NUMBER + { set_c_penglue_command($2.yint, $3.yint, $4.yint); } +; + +CharacterEntries : + /* */ +| CharacterEntries + LEFT OneCharacterEntry RIGHT +; + +OneCharacterEntry : + CHARMEASURE FIX + { set_character_measure($1.yint, $2.yfix); } +| NEXTLARGER NUMBER + { set_next_larger($2.yint); } +| VARCHAR + { init_var_character(); } + VarCharParameters +| COMMENT + +/* The following character entries are found only in VP and OVP files */ + +| MAP + { init_map(); } + MapEntries + { end_map(); } + +/* The following entries are found only in OPL and OVP files */ + +| ACCENT + { set_accent($1.yint); } +| CHARIVALUE NUMBER NUMBER + { set_character_ivalue($2.yint, $3.yint); } +| CHARMVALUE NUMBER NUMBER + { set_character_mvalue($2.yint, $3.yint); } +| CHARFVALUE NUMBER NUMBER + { set_character_fvalue($2.yint, $3.yint); } +| CHARPENALTY NUMBER NUMBER + { set_character_penalty($2.yint, $3.yint); } +| CHARRULE NUMBER NUMBER + { set_character_rule($2.yint, $3.yint); } +| CHARGLUE NUMBER NUMBER + { set_character_glue($2.yint, $3.yint); } + +; + +VarCharParameters : + /* */ +| VarCharParameters + LEFT OneVarCharParameter RIGHT +; + +OneVarCharParameter : + EXTEN NUMBER + { set_extensible_piece($1.yint, $2.yint); } +| COMMENT +; + + +/* The following four nonterminals are found only in VP and OVP files */ + +MapFontEntries : + /* */ +| MapFontEntries + LEFT OneMapFontEntry RIGHT +; + +OneMapFontEntry : + FONTNAME + { set_font_name($1.ystring); } +| FONTAREA + { set_font_area($1.ystring); } +| FONTCHECKSUM NUMBER + { set_font_check_sum($2.yint); } +| FONTAT FIX + { set_font_at($2.yfix); } +| FONTDSIZE FIX + { set_font_design_size($2.yfix); } +| COMMENT +; + +MapEntries : + /* */ +| MapEntries + LEFT OneMapEntry RIGHT +; + +OneMapEntry : + SELECTFONT NUMBER + { set_select_font($2.yint); } +| SETCHAR NUMBER + { set_set_char($2.yint); } +| SETRULE FIX FIX + { set_set_rule($2.yfix, $3.yfix); } +| MOVE FIX + { set_move($1.yint, $2.yfix); } +| PUSH + { set_push(); } +| POP + { set_pop(); } +| SPECIAL + { set_special($1.ystring); } +| SPECIALHEX + { set_special_hex($1.ystring); } +; + +/* The remaining nonterminals are found only in OPL and OVP files */ + +FontIvalueEntries : + /* */ +| FontIvalueEntries + LEFT OneFontIvalueEntry RIGHT +; + +OneFontIvalueEntry : + IVALUE NUMBER + { init_font_ivalue_entry($2.yint); } + IvalueDefinition +| COMMENT +; + +IvalueDefinition : + /* */ +| IvalueDefinition + LEFT OneIvalueDefinition RIGHT +; + +OneIvalueDefinition : + IVALUEVAL NUMBER + { set_font_ivalue_definition($2.yint); } +| COMMENT +; + +FontMvalueEntries : + /* */ +| FontMvalueEntries + LEFT OneFontMvalueEntry RIGHT +; + +OneFontMvalueEntry : + MVALUE NUMBER + { init_font_mvalue_entry($2.yint); } + MvalueDefinition +| COMMENT +; + +MvalueDefinition : + /* */ +| MvalueDefinition + LEFT OneMvalueDefinition RIGHT +; + +OneMvalueDefinition : + MVALUEVAL FIX + { set_font_mvalue_definition($2.yfix); } +| COMMENT +; + +FontFvalueEntries : + /* */ +| FontFvalueEntries + LEFT OneFontFvalueEntry RIGHT +; + +OneFontFvalueEntry : + FVALUE NUMBER + { init_font_fvalue_entry($2.yint); } + FvalueDefinition +| COMMENT +; + +FvalueDefinition : + /* */ +| FvalueDefinition + LEFT OneFvalueDefinition RIGHT +; + +OneFvalueDefinition : + FVALUEVAL FIX + { set_font_fvalue_definition($2.yfix); } +| COMMENT +; + +FontPenaltyEntries : + /* */ +| FontPenaltyEntries + LEFT OneFontPenaltyEntry RIGHT +; + +OneFontPenaltyEntry : + PENALTY NUMBER + { init_font_penalty_entry($2.yint); } + PenaltyDefinition +| COMMENT +; + +PenaltyDefinition : + /* */ +| PenaltyDefinition + LEFT OnePenaltyDefinition RIGHT +; + +OnePenaltyDefinition : + PENALTYVAL NUMBER + { set_font_penalty_definition($2.yint); } +| COMMENT +; + +FontRuleEntries : + /* */ +| FontRuleEntries + LEFT OneFontRuleEntry RIGHT +; + +OneFontRuleEntry : + RULE NUMBER + { init_font_rule_entry($2.yint); } + RuleDefinition +| COMMENT +; + +RuleDefinition : + /* */ +| RuleDefinition + LEFT OneRuleDefinition RIGHT +; + +OneRuleDefinition : + RULEMEASURE FIX + { set_font_rule_measure($1.yint, $2.yfix); } +| COMMENT +; + +FontGlueEntries : + /* */ +| FontGlueEntries + LEFT OneFontGlueEntry RIGHT +; + +OneFontGlueEntry : + GLUE NUMBER + { init_font_glue_entry($2.yint); } + GlueDefinition +| COMMENT +; + +GlueDefinition : + /* */ +| GlueDefinition + LEFT OneGlueDefinition RIGHT +; + +OneGlueDefinition : + GLUETYPE GLUEKIND + { set_font_glue_type($2.yint); } +| GLUEWD FIX + { set_font_glue_width($2.yfix); } +| GLUECHAR NUMBER + { set_font_glue_character($2.yint); } +| GLUERULE NUMBER NUMBER + { set_font_glue_rule($2.yint, $3.yint); } +| GLUESHRINKSTRETCH FIX GLUEORDER + { set_font_glue_shrink_stretch($1.yint, $2.yfix, $3.yint); } +| COMMENT +; diff --git a/Build/source/texk/web2c/omegafonts/pl.y b/Build/source/texk/web2c/omegafonts/pl.y deleted file mode 100644 index 2833db377cd..00000000000 --- a/Build/source/texk/web2c/omegafonts/pl.y +++ /dev/null @@ -1,544 +0,0 @@ -%{ -/* pl.y: Grammar for reading property list files - -This file is part of Omega, -which is based on the web2c distribution of TeX, - -Copyright (c) 1994--2001 John Plaice and Yannis Haralambous - -Omega is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -Omega is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Omega; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#include "cpascal.h" -#include "parser.h" -#include "manifests.h" -#include "list_routines.h" -#include "error_routines.h" -#include "out_routines.h" -#include "char_routines.h" -#include "header_routines.h" -#include "param_routines.h" -#include "dimen_routines.h" -#include "ligkern_routines.h" -#include "print_routines.h" -#include "font_routines.h" -#include "extra_routines.h" - -%} - -/* Basic tokens */ - -%token LEFT -%token RIGHT -%token NUMBER -%token FIX -%token COMMENT - -/* Tokens found in PL, OPL, VF and OVF files */ - -%token CHECKSUM -%token DESIGNSIZE -%token DESIGNUNITS -%token CODINGSCHEME /* implicit string */ -%token FAMILY /* implicit string */ -%token FACE -%token SEVENBITSAFEFLAG /* implicit 0 (FALSE) or 1 (TRUE) */ -%token HEADER -%token FONTDIMEN -%token LIGTABLE -%token BOUNDARYCHAR -%token CHARACTER - -%token NAMEDPARAMETER /* implicit integer */ -%token PARAMETER - -%token CHARMEASURE /* implicit integer */ -%token NEXTLARGER -%token VARCHAR -%token EXTEN /* implicit integer */ - -%token LABEL -%token LIG /* implicit integer */ -%token KRN -%token STOP -%token SKIP - -/* Tokens found only in VF and OVF files */ - -%token VTITLE - -%token MAPFONT -%token FONTNAME -%token FONTAREA -%token FONTCHECKSUM -%token FONTAT -%token FONTDSIZE - -%token MAP -%token SELECTFONT -%token SETCHAR -%token SETRULE -%token MOVE -%token PUSH -%token POP -%token SPECIAL -%token SPECIALHEX - -/* Tokens found only in OPL and OVF files */ - -%token CHARREPEAT -%token FONTIVALUE -%token FONTFVALUE -%token FONTMVALUE -%token FONTPENALTY -%token FONTRULE -%token FONTGLUE - -%token CLABEL -%token CKRN -%token CGLUE -%token CPENALTY -%token CPENGLUE - -%token CHARIVALUE -%token CHARFVALUE -%token CHARMVALUE -%token CHARPENALTY -%token CHARRULE -%token CHARGLUE - -%token IVALUE -%token IVALUEVAL - -%token MVALUE -%token MVALUEVAL - -%token FVALUE -%token FVALUEVAL - -%token PENALTY -%token PENALTYVAL - -%token RULE -%token RULEMEASURE - -%token GLUE -%token GLUEWD -%token GLUETYPE -%token GLUEKIND /* Implicit integer */ -%token GLUERULE -%token GLUECHAR -%token GLUESHRINKSTRETCH -%token GLUEORDER /* Implicit integer */ - - -%token OFMLEVEL -%token FONTDIR -%token ACCENT - -%% - -File: - Entries -; - -Entries : - /* */ -| Entries - LEFT OneEntry RIGHT -; - -OneEntry : - -/* The following entries are found in PL, OPL, VP and OVP files */ - - CHECKSUM NUMBER - { set_check_sum($2.yint); } -| DESIGNSIZE FIX - { set_design_size($2.yfix); } -| DESIGNUNITS FIX - { set_design_units($2.yfix); } -| CODINGSCHEME - { set_coding_scheme($1.ystring); } -| FAMILY - { set_family($1.ystring); } -| FACE NUMBER - { set_face($2.yint); } -| SEVENBITSAFEFLAG - { set_seven_bit_safe_flag($1.yint); } -| HEADER NUMBER NUMBER - { set_header_word($2.yint, $3.yint); } -| FONTDIMEN - { init_parameters(); } - FontParameters -| LIGTABLE - { init_ligkern(); } - LigKernEntries -| BOUNDARYCHAR NUMBER - { set_boundary_character($2.yint); } -| CHARACTER NUMBER - { init_character($2.yint, NULL); } - CharacterEntries -| COMMENT - -/* The following entries are found only in VP and OVP files */ - -| VTITLE - { set_vtitle($1.ystring); } -| MAPFONT NUMBER - { init_map_font($2.yint); } - MapFontEntries - -/* The following entries are found only in OPL and OVP files */ - -| OFMLEVEL NUMBER - { set_ofm_level($2.yint); } -| FONTDIR - { set_font_dir($1.yint); } -| CHARREPEAT NUMBER NUMBER - { init_character($2.yint,NULL); } - CharacterEntries - { copy_characters($2.yint,$3.yint); } -| FONTIVALUE NUMBER - {init_font_ivalue($2.yint);} - FontIvalueEntries -| FONTMVALUE NUMBER - { init_font_mvalue($2.yint);} - FontMvalueEntries -| FONTFVALUE NUMBER - { init_font_fvalue($2.yint);} - FontFvalueEntries -| FONTPENALTY NUMBER - { init_font_penalty($2.yint);} - FontPenaltyEntries -| FONTRULE NUMBER - { init_font_rule($2.yint);} - FontRuleEntries -| FONTGLUE NUMBER - { init_font_glue($2.yint);} - FontGlueEntries -; - -FontParameters : - /* */ -| FontParameters - LEFT OneFontParameter RIGHT -; - -OneFontParameter : - NAMEDPARAMETER FIX - { set_param_word($1.yint, $2.yfix); } -| PARAMETER NUMBER FIX - { set_param_word($2.yint, $3.yfix); } -| COMMENT -; - -LigKernEntries : - /* */ -| LigKernEntries - LEFT OneLigKernEntry RIGHT -; - -OneLigKernEntry : - LABEL NUMBER - { set_label_command($2.yint); } -| LABEL BOUNDARYCHAR - { set_label_command(CHAR_BOUNDARY); } -| LIG NUMBER NUMBER - { set_ligature_command($1.yint, $2.yint, $3.yint); } -| KRN NUMBER FIX - { set_kerning_command($2.yint, $3.yfix); } -| STOP - { set_stop_command(); } -| SKIP NUMBER - { set_skip_command($2.yint); } -| COMMENT - -/* The following entries are found only in OPL and OVP files */ - -| CLABEL NUMBER - { set_c_label_command($2.yint); } -| CKRN NUMBER FIX - { set_c_kerning_command($2.yint, $3.yfix); } -| CGLUE NUMBER NUMBER - { set_c_glue_command($2.yint, $3.yint); } -| CPENALTY NUMBER NUMBER - { set_c_penalty_command($2.yint, $3.yint); } -| CPENGLUE NUMBER NUMBER NUMBER - { set_c_penglue_command($2.yint, $3.yint, $4.yint); } -; - -CharacterEntries : - /* */ -| CharacterEntries - LEFT OneCharacterEntry RIGHT -; - -OneCharacterEntry : - CHARMEASURE FIX - { set_character_measure($1.yint, $2.yfix); } -| NEXTLARGER NUMBER - { set_next_larger($2.yint); } -| VARCHAR - { init_var_character(); } - VarCharParameters -| COMMENT - -/* The following character entries are found only in VP and OVP files */ - -| MAP - { init_map(); } - MapEntries - { end_map(); } - -/* The following entries are found only in OPL and OVP files */ - -| ACCENT - { set_accent($1.yint); } -| CHARIVALUE NUMBER NUMBER - { set_character_ivalue($2.yint, $3.yint); } -| CHARMVALUE NUMBER NUMBER - { set_character_mvalue($2.yint, $3.yint); } -| CHARFVALUE NUMBER NUMBER - { set_character_fvalue($2.yint, $3.yint); } -| CHARPENALTY NUMBER NUMBER - { set_character_penalty($2.yint, $3.yint); } -| CHARRULE NUMBER NUMBER - { set_character_rule($2.yint, $3.yint); } -| CHARGLUE NUMBER NUMBER - { set_character_glue($2.yint, $3.yint); } - -; - -VarCharParameters : - /* */ -| VarCharParameters - LEFT OneVarCharParameter RIGHT -; - -OneVarCharParameter : - EXTEN NUMBER - { set_extensible_piece($1.yint, $2.yint); } -| COMMENT -; - - -/* The following four nonterminals are found only in VP and OVP files */ - -MapFontEntries : - /* */ -| MapFontEntries - LEFT OneMapFontEntry RIGHT -; - -OneMapFontEntry : - FONTNAME - { set_font_name($1.ystring); } -| FONTAREA - { set_font_area($1.ystring); } -| FONTCHECKSUM NUMBER - { set_font_check_sum($2.yint); } -| FONTAT FIX - { set_font_at($2.yfix); } -| FONTDSIZE FIX - { set_font_design_size($2.yfix); } -| COMMENT -; - -MapEntries : - /* */ -| MapEntries - LEFT OneMapEntry RIGHT -; - -OneMapEntry : - SELECTFONT NUMBER - { set_select_font($2.yint); } -| SETCHAR NUMBER - { set_set_char($2.yint); } -| SETRULE FIX FIX - { set_set_rule($2.yfix, $3.yfix); } -| MOVE FIX - { set_move($1.yint, $2.yfix); } -| PUSH - { set_push(); } -| POP - { set_pop(); } -| SPECIAL - { set_special($1.ystring); } -| SPECIALHEX - { set_special_hex($1.ystring); } -; - -/* The remaining nonterminals are found only in OPL and OVP files */ - -FontIvalueEntries : - /* */ -| FontIvalueEntries - LEFT OneFontIvalueEntry RIGHT -; - -OneFontIvalueEntry : - IVALUE NUMBER - { init_font_ivalue_entry($2.yint); } - IvalueDefinition -| COMMENT -; - -IvalueDefinition : - /* */ -| IvalueDefinition - LEFT OneIvalueDefinition RIGHT -; - -OneIvalueDefinition : - IVALUEVAL NUMBER - { set_font_ivalue_definition($2.yint); } -| COMMENT -; - -FontMvalueEntries : - /* */ -| FontMvalueEntries - LEFT OneFontMvalueEntry RIGHT -; - -OneFontMvalueEntry : - MVALUE NUMBER - { init_font_mvalue_entry($2.yint); } - MvalueDefinition -| COMMENT -; - -MvalueDefinition : - /* */ -| MvalueDefinition - LEFT OneMvalueDefinition RIGHT -; - -OneMvalueDefinition : - MVALUEVAL FIX - { set_font_mvalue_definition($2.yfix); } -| COMMENT -; - -FontFvalueEntries : - /* */ -| FontFvalueEntries - LEFT OneFontFvalueEntry RIGHT -; - -OneFontFvalueEntry : - FVALUE NUMBER - { init_font_fvalue_entry($2.yint); } - FvalueDefinition -| COMMENT -; - -FvalueDefinition : - /* */ -| FvalueDefinition - LEFT OneFvalueDefinition RIGHT -; - -OneFvalueDefinition : - FVALUEVAL FIX - { set_font_fvalue_definition($2.yfix); } -| COMMENT -; - -FontPenaltyEntries : - /* */ -| FontPenaltyEntries - LEFT OneFontPenaltyEntry RIGHT -; - -OneFontPenaltyEntry : - PENALTY NUMBER - { init_font_penalty_entry($2.yint); } - PenaltyDefinition -| COMMENT -; - -PenaltyDefinition : - /* */ -| PenaltyDefinition - LEFT OnePenaltyDefinition RIGHT -; - -OnePenaltyDefinition : - PENALTYVAL NUMBER - { set_font_penalty_definition($2.yint); } -| COMMENT -; - -FontRuleEntries : - /* */ -| FontRuleEntries - LEFT OneFontRuleEntry RIGHT -; - -OneFontRuleEntry : - RULE NUMBER - { init_font_rule_entry($2.yint); } - RuleDefinition -| COMMENT -; - -RuleDefinition : - /* */ -| RuleDefinition - LEFT OneRuleDefinition RIGHT -; - -OneRuleDefinition : - RULEMEASURE FIX - { set_font_rule_measure($1.yint, $2.yfix); } -| COMMENT -; - -FontGlueEntries : - /* */ -| FontGlueEntries - LEFT OneFontGlueEntry RIGHT -; - -OneFontGlueEntry : - GLUE NUMBER - { init_font_glue_entry($2.yint); } - GlueDefinition -| COMMENT -; - -GlueDefinition : - /* */ -| GlueDefinition - LEFT OneGlueDefinition RIGHT -; - -OneGlueDefinition : - GLUETYPE GLUEKIND - { set_font_glue_type($2.yint); } -| GLUEWD FIX - { set_font_glue_width($2.yfix); } -| GLUECHAR NUMBER - { set_font_glue_character($2.yint); } -| GLUERULE NUMBER NUMBER - { set_font_glue_rule($2.yint, $3.yint); } -| GLUESHRINKSTRETCH FIX GLUEORDER - { set_font_glue_shrink_stretch($1.yint, $2.yfix, $3.yint); } -| COMMENT -; diff --git a/Build/source/texk/web2c/pdftexdir/.indent.pro b/Build/source/texk/web2c/pdftexdir/.indent.pro deleted file mode 100644 index e9e690f1ba8..00000000000 --- a/Build/source/texk/web2c/pdftexdir/.indent.pro +++ /dev/null @@ -1,12 +0,0 @@ -/* $Id$ */ ---k-and-r-style ---blank-lines-after-procedures ---line-length 80 ---procnames-start-lines ---no-space-after-function-call-names ---dont-break-procedure-type ---space-after-cast -/* this does not work in indent 2.2.6 :-( */ ---no-tabs -/* this is new in indent 2.2.9 */ ---preprocessor-indentation 2 diff --git a/Build/source/texk/web2c/pdftexdir/Makefile.in b/Build/source/texk/web2c/pdftexdir/Makefile.in deleted file mode 100644 index 23b083a5be0..00000000000 --- a/Build/source/texk/web2c/pdftexdir/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# Makefile for libpdf - te@dbs.uni-hannover.de -# $Id$ - -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/library.mk - -kpathsea_srcdir_parent = $(srcdir)/../.. -kpathsea_dir_parent = ../.. - -ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \ - -I. -I$(srcdir) \ - -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \ - @LIBXPDFCPPFLAGS@ \ - -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \ - -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \ - -DPDF_PARSER_ONLY -CXX = @CXX@ - -.SUFFIXES: .cc .o -.cc.o: - $(CXX) $(ALL_CXXFLAGS) -c $< - -# XCFLAGS=-Wstrict-prototypes -Wmissing-prototypes - -LIBPNGDIR=../../../libs/libpng -LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) - -ZLIBDIR=../../../libs/zlib -ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) - -LIBXPDFDIR=../../../libs/xpdf -LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR) - -LIBMD5DIR=../../../libs/md5 -LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR) - -LIBOBSDCOMPATDIR=../../../libs/obsdcompat -LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR) - -XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \ - -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \ - -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \ - -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \ - -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX - -OBJS = epdf.o mapfile.o utils.o vfpacket.o pkin.o \ -writefont.o writet1.o writet3.o writezip.o writeenc.o writettf.o \ -writejpg.o writejbig2.o writepng.o writeimg.o pdftoepdf.o avl.o avlstuff.o subfont.o tounicode.o - -all: libpdf.a - -pdftosrc.o: $(srcdir)/pdftosrc.cc - -libpdf.a: $(OBJS) - rm -f $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -kpse_include ../make/clean.mk - -clean:: - rm -f libpdf.a ttf2afm pdftosrc - -depend: - rm -f $(OBJS) ttf2afm.o pdftosrc.o - XXCFLAGS=-MM XCFLAGS=-MM $(MAKE) -k $(OBJS) ttf2afm.o pdftosrc.o | \ - grep -v "^$(CC)\|$(CXX)\|$(AR)\|make\" | \ - sed 's: [^ ]*/\.\./libs/[^ ]*::g' > $(srcdir)/depend.mk - -kpse_include pdftexdir/depend.mk diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index f51b3a3e4af..a47e6fcd233 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -150,9 +150,7 @@ EXTRA_DIST += \ ## Not used ## -EXTRA_DIST += \ - pdftexdir/.indent.pro \ - pdftexdir/pdftex.mak +EXTRA_DIST += pdftexdir/pdftex.mak ## Eventually delete these files ## diff --git a/Build/source/texk/web2c/pdftexdir/depend.mk b/Build/source/texk/web2c/pdftexdir/depend.mk deleted file mode 100644 index fa9f9dac2c4..00000000000 --- a/Build/source/texk/web2c/pdftexdir/depend.mk +++ /dev/null @@ -1,55 +0,0 @@ -epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -mapfile.o: mapfile.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -papersiz.o: papersiz.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -utils.o: utils.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h \ - ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h \ - ../../../libs/md5/md5.h pdftexextra.h \ - ../../../libs/obsdcompat/openbsd-compat.h -vfpacket.o: vfpacket.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -pkin.o: pkin.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writefont.o: writefont.c ../../../libs/xpdf/goo/gmem.h ptexlib.h \ - ../pdftexd.h ../texmfmp.h ../cpascal.h ../config.h ../help.h \ - ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writet1.o: writet1.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writet3.o: writet3.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \ - ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h -writezip.o: writezip.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h ../../../libs/zlib/zlib.h ../../../libs/zlib/zconf.h -writeenc.o: writeenc.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h -writettf.o: writettf.c ptexlib.h writettf.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h macnames.c -writejpg.o: writejpg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -writepng.o: writepng.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -writeimg.o: writeimg.c ptexlib.h ../pdftexd.h ../texmfmp.h \ - ../cpascal.h ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h \ - ptexmac.h image.h -pdftoepdf.o: pdftoepdf.cc ../../../libs/xpdf/xpdf/Object.h \ - ../../../libs/xpdf/goo/gmem.h ../../../libs/xpdf/xpdf/Array.h \ - ../../../libs/xpdf/xpdf/Dict.h ../../../libs/xpdf/xpdf/Stream.h \ - ../../../libs/xpdf/xpdf/XRef.h ../../../libs/xpdf/xpdf/Catalog.h \ - ../../../libs/xpdf/xpdf/Page.h ../../../libs/xpdf/xpdf/GfxFont.h \ - ../../../libs/xpdf/xpdf/Error.h epdf.h -ttf2afm.o: ttf2afm.c writettf.h macnames.c -pdftosrc.o: pdftosrc.cc ../../../libs/xpdf/xpdf/Object.h \ - ../../../libs/xpdf/xpdf/Array.h ../../../libs/xpdf/xpdf/Dict.h \ - ../../../libs/xpdf/xpdf/Stream.h ../../../libs/xpdf/xpdf/XRef.h \ - ../../../libs/xpdf/xpdf/Catalog.h ../../../libs/xpdf/xpdf/Page.h \ - ../../../libs/xpdf/xpdf/PDFDoc.h ../../../libs/xpdf/xpdf/Link.h \ - ../../../libs/xpdf/xpdf/Error.h ../../../libs/xpdf/xpdf/config.h diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am.orig b/Build/source/texk/xdvipdfmx/src/Makefile.am.orig new file mode 100644 index 00000000000..cc48aad185c --- /dev/null +++ b/Build/source/texk/xdvipdfmx/src/Makefile.am.orig @@ -0,0 +1,45 @@ +bin_PROGRAMS = xdvipdfmx +xdvipdfmx_SOURCES = agl.c agl_standard.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \ +cmap.c cmap_read.c cmap_write.c cs_type2.c \ +dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \ +dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \ +numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \ +pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \ +pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \ +spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c spc_xtx.c specials.c \ +subfont.c tfm.c \ +tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \ +type0.c t1_char.c t1_load.c type1.c type1c.c \ +unicode.c vf.c xbb.c \ +agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \ +cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \ +cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \ +jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \ +pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \ +pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \ +spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h spc_xtx.h specials.h \ +subfont.h system.h tfm.h \ +tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \ +type0.h t1_char.h t1_load.h type1.h type1c.h \ +unicode.h vf.h xbb.h + + +LIBPNGDIR=$(top_builddir)/../../libs/libpng +LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) +LIBPNGDEP = @LIBPNGDEP@ +LDLIBPNG = @LDLIBPNG@ + +ZLIBDIR=$(top_builddir)/../../libs/zlib +ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) +ZLIBDEP = @ZLIBDEP@ +LDZLIB = @LDZLIB@ + +FREETYPE2DIR = $(top_builddir)/../../libs/freetype2 +FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR) +LDFREETYPE2 = @LDFREETYPE2@ +FREETYPE2DEP = @FREETYPE2DEP@ + +xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @FREETYPE2CPPFLAGS@ +xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) $(LDFREETYPE2) +xdvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) $(FREETYPE2DEP) +xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@ diff --git a/Build/source/utils/ps2eps/Makefile.in.orig b/Build/source/utils/ps2eps/Makefile.in.orig new file mode 100644 index 00000000000..f7dd345b3c6 --- /dev/null +++ b/Build/source/utils/ps2eps/Makefile.in.orig @@ -0,0 +1,53 @@ +# Public domain, written by Vladimir Volovich. + +VPATH = @srcdir@ +srcdir = @srcdir@ + +CC = @CC@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ + +prefix = @prefix@ +datarootdir = @datarootdir@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +mandir = @mandir@ +manext = 1 +man1dir = $(mandir)/man$(manext) + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ + +default all: bbox + +bbox: bbox.o + $(CC) $(LDFLAGS) bbox.o -o bbox + +.c.o: + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< + +install: bbox + $(INSTALL) -d $(bindir) + $(INSTALL) -d $(man1dir) + $(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps + $(INSTALL_PROGRAM) bbox $(bindir)/bbox + $(INSTALL_DATA) $(srcdir)/ps2eps.1 $(man1dir)/ps2eps.1 + $(INSTALL_DATA) $(srcdir)/bbox.1 $(man1dir)/bbox.1 + +check: + +uninstall: + -rm -f $(bindir)/ps2eps $(bindir)/bbox $(man1dir)/ps2eps.1 $(man1dir)/bbox.1 + +clean: + -rm -f bbox bbox.o + +distclean: clean + -rm -f Makefile config.status config.log config.cache + +realclean: distclean + +mostlyclean: clean diff --git a/Build/source/utils/ps2eps/configure.in b/Build/source/utils/ps2eps/configure.in deleted file mode 100644 index 23a72b87b3d..00000000000 --- a/Build/source/utils/ps2eps/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(ps2eps, 1.61, texlive@tug.org) - -AC_CONFIG_FILES(Makefile) - -AC_PROG_INSTALL - -AC_PROG_CC - -AC_OUTPUT diff --git a/Build/source/utils/vlna/ac/withenable.ac b/Build/source/utils/vlna/ac/withenable.ac new file mode 100644 index 00000000000..ebbc6a68b27 --- /dev/null +++ b/Build/source/utils/vlna/ac/withenable.ac @@ -0,0 +1,3 @@ +## utils/vlna/ac/withenable.ac +## configure options and TL libraries required for vlna +KPSE_WITH_PROG([vlna]) -- cgit v1.2.3