summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/libs/t1lib/ChangeLog4
-rw-r--r--Build/source/libs/t1lib/Makefile.am70
-rw-r--r--Build/source/libs/t1lib/Makefile.in68
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog8
-rw-r--r--Build/source/texk/ps2pkm/Makefile.am48
-rw-r--r--Build/source/texk/ps2pkm/Makefile.in46
-rw-r--r--Build/source/texk/ps2pkm/basics.c9
-rw-r--r--Build/source/texk/seetexk/ChangeLog4
-rw-r--r--Build/source/texk/seetexk/types.h18
-rw-r--r--Build/source/texk/web2c/omegafonts/pl-lexer.c431
-rw-r--r--Build/source/texk/web2c/omegafonts/pl-lexer.l11
11 files changed, 419 insertions, 298 deletions
diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog
index d74d680e27c..ef262ddf80e 100644
--- a/Build/source/libs/t1lib/ChangeLog
+++ b/Build/source/libs/t1lib/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: List all t1lib source files.
+
2009-12-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Exchange role of t1lib.h and lib/t1lib/t1lib.h
diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am
index ea736426adb..5a16f62aea1 100644
--- a/Build/source/libs/t1lib/Makefile.am
+++ b/Build/source/libs/t1lib/Makefile.am
@@ -1,6 +1,6 @@
## Proxy Makefile.am to build t1lib for TeX Live.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
##
## This file is free software; the copyright holder
## gives unlimited permission to copy and/or distribute it,
@@ -48,37 +48,101 @@ nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
lib_t1lib_sources = \
$(T1LIB_TREE)/lib/t1lib/parseAFM.c \
+ $(T1LIB_TREE)/lib/t1lib/parseAFM.h \
$(T1LIB_TREE)/lib/t1lib/t1aaset.c \
+ $(T1LIB_TREE)/lib/t1lib/t1aaset.h \
$(T1LIB_TREE)/lib/t1lib/t1afmtool.c \
+ $(T1LIB_TREE)/lib/t1lib/t1afmtool.h \
$(T1LIB_TREE)/lib/t1lib/t1base.c \
+ $(T1LIB_TREE)/lib/t1lib/t1base.h \
$(T1LIB_TREE)/lib/t1lib/t1delete.c \
+ $(T1LIB_TREE)/lib/t1lib/t1delete.h \
$(T1LIB_TREE)/lib/t1lib/t1enc.c \
+ $(T1LIB_TREE)/lib/t1lib/t1enc.h \
$(T1LIB_TREE)/lib/t1lib/t1env.c \
+ $(T1LIB_TREE)/lib/t1lib/t1env.h \
+ $(T1LIB_TREE)/lib/t1lib/t1extern.h \
$(T1LIB_TREE)/lib/t1lib/t1finfo.c \
+ $(T1LIB_TREE)/lib/t1lib/t1finfo.h \
+ $(T1LIB_TREE)/lib/t1lib/t1global.h \
$(T1LIB_TREE)/lib/t1lib/t1load.c \
+ $(T1LIB_TREE)/lib/t1lib/t1load.h \
+ $(T1LIB_TREE)/lib/t1lib/t1misc.h \
$(T1LIB_TREE)/lib/t1lib/t1outline.c \
+ $(T1LIB_TREE)/lib/t1lib/t1outline.h \
$(T1LIB_TREE)/lib/t1lib/t1set.c \
+ $(T1LIB_TREE)/lib/t1lib/t1set.h \
$(T1LIB_TREE)/lib/t1lib/t1subset.c \
- $(T1LIB_TREE)/lib/t1lib/t1trans.c
+ $(T1LIB_TREE)/lib/t1lib/t1subset.h \
+ $(T1LIB_TREE)/lib/t1lib/t1trans.c \
+ $(T1LIB_TREE)/lib/t1lib/t1trans.h \
+ $(T1LIB_TREE)/lib/t1lib/t1types.h
+
+lib_t1lib_generated = \
+ lib/t1lib/sysconf.h \
+ lib/t1lib/t1lib.h
+
+lib_t1lib_unused = \
+ $(T1LIB_TREE)/lib/t1lib/t1libx.h \
+ $(T1LIB_TREE)/lib/t1lib/t1x11.c \
+ $(T1LIB_TREE)/lib/t1lib/t1x11.h \
+ $(T1LIB_TREE)/lib/type1/t1intf.h
lib_type1_sources = \
+ $(T1LIB_TREE)/lib/type1/Xstuff.h \
$(T1LIB_TREE)/lib/type1/arith.c \
+ $(T1LIB_TREE)/lib/type1/arith.h \
+ $(T1LIB_TREE)/lib/type1/blues.h \
$(T1LIB_TREE)/lib/type1/bstring.c \
+ $(T1LIB_TREE)/lib/type1/cluts.h \
$(T1LIB_TREE)/lib/type1/curves.c \
+ $(T1LIB_TREE)/lib/type1/curves.h \
+ $(T1LIB_TREE)/lib/type1/digit.h \
+ $(T1LIB_TREE)/lib/type1/ffilest.h \
+ $(T1LIB_TREE)/lib/type1/font.h \
$(T1LIB_TREE)/lib/type1/fontfcn.c \
+ $(T1LIB_TREE)/lib/type1/fontfcn.h \
+ $(T1LIB_TREE)/lib/type1/fontfile.h \
+ $(T1LIB_TREE)/lib/type1/fontmisc.h \
+ $(T1LIB_TREE)/lib/type1/fonts.h \
+ $(T1LIB_TREE)/lib/type1/fontstruct.h \
+ $(T1LIB_TREE)/lib/type1/fontxlfd.h \
+ $(T1LIB_TREE)/lib/type1/fsmasks.h \
+ $(T1LIB_TREE)/lib/type1/hdigit.h \
$(T1LIB_TREE)/lib/type1/hints.c \
+ $(T1LIB_TREE)/lib/type1/hints.h \
$(T1LIB_TREE)/lib/type1/lines.c \
+ $(T1LIB_TREE)/lib/type1/lines.h \
$(T1LIB_TREE)/lib/type1/objects.c \
+ $(T1LIB_TREE)/lib/type1/objects.h \
$(T1LIB_TREE)/lib/type1/paths.c \
+ $(T1LIB_TREE)/lib/type1/paths.h \
+ $(T1LIB_TREE)/lib/type1/paths_rmz.h \
+ $(T1LIB_TREE)/lib/type1/pictures.h \
$(T1LIB_TREE)/lib/type1/regions.c \
+ $(T1LIB_TREE)/lib/type1/regions.h \
$(T1LIB_TREE)/lib/type1/scanfont.c \
$(T1LIB_TREE)/lib/type1/spaces.c \
+ $(T1LIB_TREE)/lib/type1/spaces.h \
+ $(T1LIB_TREE)/lib/type1/spaces_rmz.h \
+ $(T1LIB_TREE)/lib/type1/strokes.h \
+ $(T1LIB_TREE)/lib/type1/t1hdigit.h \
+ $(T1LIB_TREE)/lib/type1/t1imager.h \
$(T1LIB_TREE)/lib/type1/t1io.c \
$(T1LIB_TREE)/lib/type1/t1snap.c \
+ $(T1LIB_TREE)/lib/type1/t1stdio.h \
$(T1LIB_TREE)/lib/type1/t1stub.c \
$(T1LIB_TREE)/lib/type1/token.c \
+ $(T1LIB_TREE)/lib/type1/token.h \
+ $(T1LIB_TREE)/lib/type1/tokst.h \
+ $(T1LIB_TREE)/lib/type1/trig.h \
$(T1LIB_TREE)/lib/type1/type1.c \
- $(T1LIB_TREE)/lib/type1/util.c
+ $(T1LIB_TREE)/lib/type1/types.h \
+ $(T1LIB_TREE)/lib/type1/util.c \
+ $(T1LIB_TREE)/lib/type1/util.h
+
+lib_type1_unused = \
+ $(T1LIB_TREE)/lib/type1/t1intf.h
if build
check_PROGRAMS = type1afm
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index b021ac47081..b68f045520e 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -213,37 +213,101 @@ noinst_LIBRARIES = libt1.a
nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
lib_t1lib_sources = \
$(T1LIB_TREE)/lib/t1lib/parseAFM.c \
+ $(T1LIB_TREE)/lib/t1lib/parseAFM.h \
$(T1LIB_TREE)/lib/t1lib/t1aaset.c \
+ $(T1LIB_TREE)/lib/t1lib/t1aaset.h \
$(T1LIB_TREE)/lib/t1lib/t1afmtool.c \
+ $(T1LIB_TREE)/lib/t1lib/t1afmtool.h \
$(T1LIB_TREE)/lib/t1lib/t1base.c \
+ $(T1LIB_TREE)/lib/t1lib/t1base.h \
$(T1LIB_TREE)/lib/t1lib/t1delete.c \
+ $(T1LIB_TREE)/lib/t1lib/t1delete.h \
$(T1LIB_TREE)/lib/t1lib/t1enc.c \
+ $(T1LIB_TREE)/lib/t1lib/t1enc.h \
$(T1LIB_TREE)/lib/t1lib/t1env.c \
+ $(T1LIB_TREE)/lib/t1lib/t1env.h \
+ $(T1LIB_TREE)/lib/t1lib/t1extern.h \
$(T1LIB_TREE)/lib/t1lib/t1finfo.c \
+ $(T1LIB_TREE)/lib/t1lib/t1finfo.h \
+ $(T1LIB_TREE)/lib/t1lib/t1global.h \
$(T1LIB_TREE)/lib/t1lib/t1load.c \
+ $(T1LIB_TREE)/lib/t1lib/t1load.h \
+ $(T1LIB_TREE)/lib/t1lib/t1misc.h \
$(T1LIB_TREE)/lib/t1lib/t1outline.c \
+ $(T1LIB_TREE)/lib/t1lib/t1outline.h \
$(T1LIB_TREE)/lib/t1lib/t1set.c \
+ $(T1LIB_TREE)/lib/t1lib/t1set.h \
$(T1LIB_TREE)/lib/t1lib/t1subset.c \
- $(T1LIB_TREE)/lib/t1lib/t1trans.c
+ $(T1LIB_TREE)/lib/t1lib/t1subset.h \
+ $(T1LIB_TREE)/lib/t1lib/t1trans.c \
+ $(T1LIB_TREE)/lib/t1lib/t1trans.h \
+ $(T1LIB_TREE)/lib/t1lib/t1types.h
+
+lib_t1lib_generated = \
+ lib/t1lib/sysconf.h \
+ lib/t1lib/t1lib.h
+
+lib_t1lib_unused = \
+ $(T1LIB_TREE)/lib/t1lib/t1libx.h \
+ $(T1LIB_TREE)/lib/t1lib/t1x11.c \
+ $(T1LIB_TREE)/lib/t1lib/t1x11.h \
+ $(T1LIB_TREE)/lib/type1/t1intf.h
lib_type1_sources = \
+ $(T1LIB_TREE)/lib/type1/Xstuff.h \
$(T1LIB_TREE)/lib/type1/arith.c \
+ $(T1LIB_TREE)/lib/type1/arith.h \
+ $(T1LIB_TREE)/lib/type1/blues.h \
$(T1LIB_TREE)/lib/type1/bstring.c \
+ $(T1LIB_TREE)/lib/type1/cluts.h \
$(T1LIB_TREE)/lib/type1/curves.c \
+ $(T1LIB_TREE)/lib/type1/curves.h \
+ $(T1LIB_TREE)/lib/type1/digit.h \
+ $(T1LIB_TREE)/lib/type1/ffilest.h \
+ $(T1LIB_TREE)/lib/type1/font.h \
$(T1LIB_TREE)/lib/type1/fontfcn.c \
+ $(T1LIB_TREE)/lib/type1/fontfcn.h \
+ $(T1LIB_TREE)/lib/type1/fontfile.h \
+ $(T1LIB_TREE)/lib/type1/fontmisc.h \
+ $(T1LIB_TREE)/lib/type1/fonts.h \
+ $(T1LIB_TREE)/lib/type1/fontstruct.h \
+ $(T1LIB_TREE)/lib/type1/fontxlfd.h \
+ $(T1LIB_TREE)/lib/type1/fsmasks.h \
+ $(T1LIB_TREE)/lib/type1/hdigit.h \
$(T1LIB_TREE)/lib/type1/hints.c \
+ $(T1LIB_TREE)/lib/type1/hints.h \
$(T1LIB_TREE)/lib/type1/lines.c \
+ $(T1LIB_TREE)/lib/type1/lines.h \
$(T1LIB_TREE)/lib/type1/objects.c \
+ $(T1LIB_TREE)/lib/type1/objects.h \
$(T1LIB_TREE)/lib/type1/paths.c \
+ $(T1LIB_TREE)/lib/type1/paths.h \
+ $(T1LIB_TREE)/lib/type1/paths_rmz.h \
+ $(T1LIB_TREE)/lib/type1/pictures.h \
$(T1LIB_TREE)/lib/type1/regions.c \
+ $(T1LIB_TREE)/lib/type1/regions.h \
$(T1LIB_TREE)/lib/type1/scanfont.c \
$(T1LIB_TREE)/lib/type1/spaces.c \
+ $(T1LIB_TREE)/lib/type1/spaces.h \
+ $(T1LIB_TREE)/lib/type1/spaces_rmz.h \
+ $(T1LIB_TREE)/lib/type1/strokes.h \
+ $(T1LIB_TREE)/lib/type1/t1hdigit.h \
+ $(T1LIB_TREE)/lib/type1/t1imager.h \
$(T1LIB_TREE)/lib/type1/t1io.c \
$(T1LIB_TREE)/lib/type1/t1snap.c \
+ $(T1LIB_TREE)/lib/type1/t1stdio.h \
$(T1LIB_TREE)/lib/type1/t1stub.c \
$(T1LIB_TREE)/lib/type1/token.c \
+ $(T1LIB_TREE)/lib/type1/token.h \
+ $(T1LIB_TREE)/lib/type1/tokst.h \
+ $(T1LIB_TREE)/lib/type1/trig.h \
$(T1LIB_TREE)/lib/type1/type1.c \
- $(T1LIB_TREE)/lib/type1/util.c
+ $(T1LIB_TREE)/lib/type1/types.h \
+ $(T1LIB_TREE)/lib/type1/util.c \
+ $(T1LIB_TREE)/lib/type1/util.h
+
+lib_type1_unused = \
+ $(T1LIB_TREE)/lib/type1/t1intf.h
@build_TRUE@dist_check_SCRIPTS = type1afm.test
@build_TRUE@TESTS = type1afm.test
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index c31603f8523..f084aa0017d 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: List all used header files.
+
+2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * basics.c: #include "basics.h" and drop all others.
+
2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* t1info.c (ComputeStdProps): Declare rc as int, not LONG,
diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am
index b3bc5bb9531..e4c04941895 100644
--- a/Build/source/texk/ps2pkm/Makefile.am
+++ b/Build/source/texk/ps2pkm/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/ps2pkm/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -28,18 +28,31 @@ pk2bm_SOURCES = \
pkin.h
ps2pk_SOURCES = \
+ Xstuff.h \
arith.c \
arith.h \
basics.c \
basics.h \
+ blues.h \
bstring.c \
+ cluts.h \
curves.c \
curves.h \
+ digit.h \
encoding.c \
+ ffilest.h \
filenames.c \
filenames.h \
+ font.h \
fontfcn.c \
fontfcn.h \
+ fontfile.h \
+ fontmisc.h \
+ fonts.h \
+ fontstruct.h \
+ fontxlfd.h \
+ fsmasks.h \
+ hdigit.h \
hints.c \
hints.h \
lines.c \
@@ -48,22 +61,32 @@ ps2pk_SOURCES = \
objects.h \
paths.c \
paths.h \
+ pictures.h \
pkout.c \
pkout.h \
ps2pk.c \
+ psearch.h \
regions.c \
regions.h \
scanfont.c \
spaces.c \
spaces.h \
+ strokes.h \
t1funcs.c \
+ t1hdigit.h \
+ t1imager.h \
t1info.c \
+ t1intf.h \
t1io.c \
t1snap.c \
+ t1stdio.h \
t1stub.c \
token.c \
token.h \
+ tokst.h \
+ trig.h \
type1.c \
+ types.h \
util.c \
util.h
@@ -83,39 +106,16 @@ EXTRA_DIST = \
INSTALLATION \
README.14m \
README.type1 \
- Xstuff.h \
basename.c \
- blues.h \
- cluts.h \
- digit.h \
- ffilest.h \
flisearch.c \
- font.h \
- fontfile.h \
- fontmisc.h \
- fonts.h \
- fontstruct.h \
- fontxlfd.h \
- fsmasks.h \
- hdigit.h \
- pictures.h \
pktest.c \
protos.h \
psearch.c \
- psearch.h \
sexpr.c \
strexpr.c \
strexpr.h \
- strokes.h \
- t1hdigit.h \
- t1imager.h \
- t1intf.h \
- t1stdio.h \
t1test.c \
texfiles.c \
texfiles.h \
- tokst.h \
- trig.h \
- types.h \
usenet
diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in
index fd88e01681c..a3994eceb9f 100644
--- a/Build/source/texk/ps2pkm/Makefile.in
+++ b/Build/source/texk/ps2pkm/Makefile.in
@@ -288,18 +288,31 @@ pk2bm_SOURCES = \
pkin.h
ps2pk_SOURCES = \
+ Xstuff.h \
arith.c \
arith.h \
basics.c \
basics.h \
+ blues.h \
bstring.c \
+ cluts.h \
curves.c \
curves.h \
+ digit.h \
encoding.c \
+ ffilest.h \
filenames.c \
filenames.h \
+ font.h \
fontfcn.c \
fontfcn.h \
+ fontfile.h \
+ fontmisc.h \
+ fonts.h \
+ fontstruct.h \
+ fontxlfd.h \
+ fsmasks.h \
+ hdigit.h \
hints.c \
hints.h \
lines.c \
@@ -308,22 +321,32 @@ ps2pk_SOURCES = \
objects.h \
paths.c \
paths.h \
+ pictures.h \
pkout.c \
pkout.h \
ps2pk.c \
+ psearch.h \
regions.c \
regions.h \
scanfont.c \
spaces.c \
spaces.h \
+ strokes.h \
t1funcs.c \
+ t1hdigit.h \
+ t1imager.h \
t1info.c \
+ t1intf.h \
t1io.c \
t1snap.c \
+ t1stdio.h \
t1stub.c \
token.c \
token.h \
+ tokst.h \
+ trig.h \
type1.c \
+ types.h \
util.c \
util.h
@@ -334,40 +357,17 @@ EXTRA_DIST = \
INSTALLATION \
README.14m \
README.type1 \
- Xstuff.h \
basename.c \
- blues.h \
- cluts.h \
- digit.h \
- ffilest.h \
flisearch.c \
- font.h \
- fontfile.h \
- fontmisc.h \
- fonts.h \
- fontstruct.h \
- fontxlfd.h \
- fsmasks.h \
- hdigit.h \
- pictures.h \
pktest.c \
protos.h \
psearch.c \
- psearch.h \
sexpr.c \
strexpr.c \
strexpr.h \
- strokes.h \
- t1hdigit.h \
- t1imager.h \
- t1intf.h \
- t1stdio.h \
t1test.c \
texfiles.c \
texfiles.h \
- tokst.h \
- trig.h \
- types.h \
usenet
all: c-auto.h
diff --git a/Build/source/texk/ps2pkm/basics.c b/Build/source/texk/ps2pkm/basics.c
index ca543a60fc8..273d4d245b8 100644
--- a/Build/source/texk/ps2pkm/basics.c
+++ b/Build/source/texk/ps2pkm/basics.c
@@ -4,14 +4,7 @@
* VERSION: 1.0 (September 1995)
*/
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h> /* stat() */
-#if defined(WIN32) && !defined(__MINGW32__)
-#include <win32lib.h>
-#endif
+#include "basics.h"
/* Give up ... */
void fatal(char *fmt, ...)
diff --git a/Build/source/texk/seetexk/ChangeLog b/Build/source/texk/seetexk/ChangeLog
index 188c4dfffd8..71bfeef36b5 100644
--- a/Build/source/texk/seetexk/ChangeLog
+++ b/Build/source/texk/seetexk/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * types.h: Don't #include <win32lib.h> for KPATHSEA.
+
2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* types.h: Do not #include <win32lib.h> for MinGW32. Moved
diff --git a/Build/source/texk/seetexk/types.h b/Build/source/texk/seetexk/types.h
index 947a9a10ced..971e897ec1d 100644
--- a/Build/source/texk/seetexk/types.h
+++ b/Build/source/texk/seetexk/types.h
@@ -13,8 +13,17 @@
#ifndef _MCTEX_TYPES_
#define _MCTEX_TYPES_
+#ifdef KPATHSEA
+
+#include <kpathsea/config.h>
+#include <kpathsea/c-memstr.h>
+
+#define BLOCK_COPY(from, to, len) memmove(to, from, len)
+
+#else
+
#if defined(WIN32) && !defined(__MINGW32__)
-#include <win32lib.h>
+#include <win32lib.h> /* not KPATHSEA */
#undef index
#endif
@@ -37,13 +46,6 @@
/* #define BLOCK_COPY(from, to, len) memmove(to, from, len) */
#define BLOCK_COPY(from, to, len) bcopy(from, to, len)
-#ifdef KPATHSEA
-
-#include <kpathsea/config.h>
-#include <kpathsea/c-memstr.h>
-
-#else
-
/*
* Define void as int if your compiler does not support void,
* or if there are bugs in its support (e.g., 4.1BSD).
diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.c b/Build/source/texk/web2c/omegafonts/pl-lexer.c
index 5a12a6a942c..e75f0436d3f 100644
--- a/Build/source/texk/web2c/omegafonts/pl-lexer.c
+++ b/Build/source/texk/web2c/omegafonts/pl-lexer.c
@@ -1012,17 +1012,8 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
*/
-#include <string.h>
-#include <kpathsea/c-proto.h>
-#ifdef WIN32
-#if defined __MINGW32__
-#include <kpathsea/mingw32.h>
-#else
-#include <win32lib.h>
-#endif
-#endif
+#include <kpathsea/config.h>
#include "parser.h"
-#include "kpathsea/types.h"
#include "pl-parser.h"
#include "manifests.h"
#include "error_routines.h"
@@ -1057,7 +1048,7 @@ extern char *xstrdup (const char *);
/* For Solaris's lex, to increase tables sizes --RP */
/* Space before number keeps ancient flex happy. */
-#line 1061 "pl-lexer.c"
+#line 1052 "pl-lexer.c"
#define INITIAL 0
@@ -1239,10 +1230,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 84 "pl-lexer.l"
+#line 75 "pl-lexer.l"
-#line 1246 "pl-lexer.c"
+#line 1237 "pl-lexer.c"
if ( !(yy_init) )
{
@@ -1346,1041 +1337,1041 @@ do_action: /* This label is used only to access EOF actions. */
{ /* beginning of action switch */
case 1:
YY_RULE_SETUP
-#line 86 "pl-lexer.l"
+#line 77 "pl-lexer.l"
{}
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 87 "pl-lexer.l"
+#line 78 "pl-lexer.l"
{line_number++; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 89 "pl-lexer.l"
+#line 80 "pl-lexer.l"
return(LEFT);
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 90 "pl-lexer.l"
+#line 81 "pl-lexer.l"
return(RIGHT);
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 92 "pl-lexer.l"
+#line 83 "pl-lexer.l"
{scan_int(8); return(NUMBER); }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 93 "pl-lexer.l"
+#line 84 "pl-lexer.l"
{scan_int(10); return(NUMBER); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 94 "pl-lexer.l"
+#line 85 "pl-lexer.l"
{scan_int(16); return(NUMBER); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 95 "pl-lexer.l"
+#line 86 "pl-lexer.l"
{scan_char(); return(NUMBER); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 96 "pl-lexer.l"
+#line 87 "pl-lexer.l"
{scan_fix(); return(FIX); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 98 "pl-lexer.l"
+#line 89 "pl-lexer.l"
{scan_string("CODINGSCHEME", KEEP_CONVERT, LEN_CODING_SCHEME);
return(CODINGSCHEME); }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 100 "pl-lexer.l"
+#line 91 "pl-lexer.l"
{scan_string("FAMILY", KEEP_CONVERT, LEN_FAMILY);
return(FAMILY); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 102 "pl-lexer.l"
+#line 93 "pl-lexer.l"
{scan_string("VTITLE", KEEP_ALL, LEN_VTITLE);
return(VTITLE); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 104 "pl-lexer.l"
+#line 95 "pl-lexer.l"
{scan_string("FONTNAME", KEEP_ALL, LEN_FONT_NAME);
return(FONTNAME); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 106 "pl-lexer.l"
+#line 97 "pl-lexer.l"
{scan_string("FONTAREA", KEEP_ALL, LEN_FONT_AREA);
return(FONTAREA); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 108 "pl-lexer.l"
+#line 99 "pl-lexer.l"
{scan_string("SPECIAL", KEEP_ALL, 0);
return(SPECIAL); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 110 "pl-lexer.l"
+#line 101 "pl-lexer.l"
{scan_string("COMMENT", KEEP_NONE, 0);
return(COMMENT); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 113 "pl-lexer.l"
+#line 104 "pl-lexer.l"
{scan_hex_string(); return(SPECIALHEX); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 116 "pl-lexer.l"
+#line 107 "pl-lexer.l"
{yylval.yint=1; return(SEVENBITSAFEFLAG); }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 117 "pl-lexer.l"
+#line 108 "pl-lexer.l"
{yylval.yint=0; return(SEVENBITSAFEFLAG); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 119 "pl-lexer.l"
+#line 110 "pl-lexer.l"
return(CHECKSUM);
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 120 "pl-lexer.l"
+#line 111 "pl-lexer.l"
return(DESIGNSIZE);
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 121 "pl-lexer.l"
+#line 112 "pl-lexer.l"
return(DESIGNUNITS);
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 122 "pl-lexer.l"
+#line 113 "pl-lexer.l"
return(FACE);
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 123 "pl-lexer.l"
+#line 114 "pl-lexer.l"
return(HEADER);
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 124 "pl-lexer.l"
+#line 115 "pl-lexer.l"
return(BOUNDARYCHAR);
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 125 "pl-lexer.l"
+#line 116 "pl-lexer.l"
return(FONTDIMEN);
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 126 "pl-lexer.l"
+#line 117 "pl-lexer.l"
return(LIGTABLE);
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 127 "pl-lexer.l"
+#line 118 "pl-lexer.l"
return(CHARACTER);
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 129 "pl-lexer.l"
+#line 120 "pl-lexer.l"
return(PARAMETER);
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 130 "pl-lexer.l"
+#line 121 "pl-lexer.l"
return(LABEL);
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 131 "pl-lexer.l"
+#line 122 "pl-lexer.l"
return(KRN);
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 132 "pl-lexer.l"
+#line 123 "pl-lexer.l"
return(STOP);
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 133 "pl-lexer.l"
+#line 124 "pl-lexer.l"
return(SKIP);
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 134 "pl-lexer.l"
+#line 125 "pl-lexer.l"
return(NEXTLARGER);
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 135 "pl-lexer.l"
+#line 126 "pl-lexer.l"
return(VARCHAR);
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 137 "pl-lexer.l"
+#line 128 "pl-lexer.l"
{yylval.yint = C_WD; return(CHARMEASURE); }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 138 "pl-lexer.l"
+#line 129 "pl-lexer.l"
{yylval.yint = C_HT; return(CHARMEASURE); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 139 "pl-lexer.l"
+#line 130 "pl-lexer.l"
{yylval.yint = C_DP; return(CHARMEASURE); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 140 "pl-lexer.l"
+#line 131 "pl-lexer.l"
{yylval.yint = C_IC; return(CHARMEASURE); }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 142 "pl-lexer.l"
+#line 133 "pl-lexer.l"
{yylval.yint = E_TOP; return(EXTEN); }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 143 "pl-lexer.l"
+#line 134 "pl-lexer.l"
{yylval.yint = E_MID; return(EXTEN); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 144 "pl-lexer.l"
+#line 135 "pl-lexer.l"
{yylval.yint = E_BOT; return(EXTEN); }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 145 "pl-lexer.l"
+#line 136 "pl-lexer.l"
{yylval.yint = E_REP; return(EXTEN); }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 147 "pl-lexer.l"
+#line 138 "pl-lexer.l"
{yylval.yint = L_0; return(LIG); }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 148 "pl-lexer.l"
+#line 139 "pl-lexer.l"
{yylval.yint = L_B; return(LIG); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 149 "pl-lexer.l"
+#line 140 "pl-lexer.l"
{yylval.yint = L_A; return(LIG); }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 150 "pl-lexer.l"
+#line 141 "pl-lexer.l"
{yylval.yint = L_AB; return(LIG); }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 151 "pl-lexer.l"
+#line 142 "pl-lexer.l"
{yylval.yint = L_Bx; return(LIG); }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 152 "pl-lexer.l"
+#line 143 "pl-lexer.l"
{yylval.yint = L_Ax; return(LIG); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 153 "pl-lexer.l"
+#line 144 "pl-lexer.l"
{yylval.yint = L_ABx; return(LIG); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 154 "pl-lexer.l"
+#line 145 "pl-lexer.l"
{yylval.yint = L_ABxx; return(LIG); }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 156 "pl-lexer.l"
+#line 147 "pl-lexer.l"
{yylval.yint = F_MRR; return(NUMBER); }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 157 "pl-lexer.l"
+#line 148 "pl-lexer.l"
{yylval.yint = F_MIR; return(NUMBER); }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 158 "pl-lexer.l"
+#line 149 "pl-lexer.l"
{yylval.yint = F_BRR; return(NUMBER); }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 159 "pl-lexer.l"
+#line 150 "pl-lexer.l"
{yylval.yint = F_BIR; return(NUMBER); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 160 "pl-lexer.l"
+#line 151 "pl-lexer.l"
{yylval.yint = F_LRR; return(NUMBER); }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 161 "pl-lexer.l"
+#line 152 "pl-lexer.l"
{yylval.yint = F_LIR; return(NUMBER); }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 162 "pl-lexer.l"
+#line 153 "pl-lexer.l"
{yylval.yint = F_MRC; return(NUMBER); }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 163 "pl-lexer.l"
+#line 154 "pl-lexer.l"
{yylval.yint = F_MIC; return(NUMBER); }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 164 "pl-lexer.l"
+#line 155 "pl-lexer.l"
{yylval.yint = F_BRC; return(NUMBER); }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 165 "pl-lexer.l"
+#line 156 "pl-lexer.l"
{yylval.yint = F_BIC; return(NUMBER); }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 166 "pl-lexer.l"
+#line 157 "pl-lexer.l"
{yylval.yint = F_LRC; return(NUMBER); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 167 "pl-lexer.l"
+#line 158 "pl-lexer.l"
{yylval.yint = F_LIC; return(NUMBER); }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 168 "pl-lexer.l"
+#line 159 "pl-lexer.l"
{yylval.yint = F_MRE; return(NUMBER); }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 169 "pl-lexer.l"
+#line 160 "pl-lexer.l"
{yylval.yint = F_MIE; return(NUMBER); }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 170 "pl-lexer.l"
+#line 161 "pl-lexer.l"
{yylval.yint = F_BRE; return(NUMBER); }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 171 "pl-lexer.l"
+#line 162 "pl-lexer.l"
{yylval.yint = F_BIE; return(NUMBER); }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 172 "pl-lexer.l"
+#line 163 "pl-lexer.l"
{yylval.yint = F_LRE; return(NUMBER); }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 173 "pl-lexer.l"
+#line 164 "pl-lexer.l"
{yylval.yint = F_LIE; return(NUMBER); }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 175 "pl-lexer.l"
+#line 166 "pl-lexer.l"
{yylval.yint = P_SLANT; return(NAMEDPARAMETER); }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 176 "pl-lexer.l"
+#line 167 "pl-lexer.l"
{yylval.yint = P_SPACE; return(NAMEDPARAMETER); }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 177 "pl-lexer.l"
+#line 168 "pl-lexer.l"
{yylval.yint = P_STRETCH; return(NAMEDPARAMETER); }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 178 "pl-lexer.l"
+#line 169 "pl-lexer.l"
{yylval.yint = P_SHRINK; return(NAMEDPARAMETER); }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 179 "pl-lexer.l"
+#line 170 "pl-lexer.l"
{yylval.yint = P_XHEIGHT; return(NAMEDPARAMETER); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 180 "pl-lexer.l"
+#line 171 "pl-lexer.l"
{yylval.yint = P_QUAD; return(NAMEDPARAMETER); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 181 "pl-lexer.l"
+#line 172 "pl-lexer.l"
{yylval.yint = P_EXTRASPACE; return(NAMEDPARAMETER); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 182 "pl-lexer.l"
+#line 173 "pl-lexer.l"
{yylval.yint = P_NUM1; return(NAMEDPARAMETER); }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 183 "pl-lexer.l"
+#line 174 "pl-lexer.l"
{yylval.yint = P_NUM2; return(NAMEDPARAMETER); }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 184 "pl-lexer.l"
+#line 175 "pl-lexer.l"
{yylval.yint = P_NUM3; return(NAMEDPARAMETER); }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 185 "pl-lexer.l"
+#line 176 "pl-lexer.l"
{yylval.yint = P_DENOM1; return(NAMEDPARAMETER); }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 186 "pl-lexer.l"
+#line 177 "pl-lexer.l"
{yylval.yint = P_DENOM2; return(NAMEDPARAMETER); }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 187 "pl-lexer.l"
+#line 178 "pl-lexer.l"
{yylval.yint = P_SUP1; return(NAMEDPARAMETER); }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 188 "pl-lexer.l"
+#line 179 "pl-lexer.l"
{yylval.yint = P_SUP2; return(NAMEDPARAMETER); }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 189 "pl-lexer.l"
+#line 180 "pl-lexer.l"
{yylval.yint = P_SUP3; return(NAMEDPARAMETER); }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 190 "pl-lexer.l"
+#line 181 "pl-lexer.l"
{yylval.yint = P_SUB1; return(NAMEDPARAMETER); }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 191 "pl-lexer.l"
+#line 182 "pl-lexer.l"
{yylval.yint = P_SUB2; return(NAMEDPARAMETER); }
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 192 "pl-lexer.l"
+#line 183 "pl-lexer.l"
{yylval.yint = P_SUPDROP; return(NAMEDPARAMETER); }
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 193 "pl-lexer.l"
+#line 184 "pl-lexer.l"
{yylval.yint = P_SUBDROP; return(NAMEDPARAMETER); }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 194 "pl-lexer.l"
+#line 185 "pl-lexer.l"
{yylval.yint = P_DELIM1; return(NAMEDPARAMETER); }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 195 "pl-lexer.l"
+#line 186 "pl-lexer.l"
{yylval.yint = P_DELIM2; return(NAMEDPARAMETER); }
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 196 "pl-lexer.l"
+#line 187 "pl-lexer.l"
{yylval.yint = P_AXISHEIGHT; return(NAMEDPARAMETER); }
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 198 "pl-lexer.l"
+#line 189 "pl-lexer.l"
{yylval.yint = P_DEFAULTRULETHICKNESS;
return(NAMEDPARAMETER); }
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 200 "pl-lexer.l"
+#line 191 "pl-lexer.l"
{yylval.yint = P_BIGOPSPACING1; return(NAMEDPARAMETER); }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 201 "pl-lexer.l"
+#line 192 "pl-lexer.l"
{yylval.yint = P_BIGOPSPACING2; return(NAMEDPARAMETER); }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 202 "pl-lexer.l"
+#line 193 "pl-lexer.l"
{yylval.yint = P_BIGOPSPACING3; return(NAMEDPARAMETER); }
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 203 "pl-lexer.l"
+#line 194 "pl-lexer.l"
{yylval.yint = P_BIGOPSPACING4; return(NAMEDPARAMETER); }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 204 "pl-lexer.l"
+#line 195 "pl-lexer.l"
{yylval.yint = P_BIGOPSPACING5; return(NAMEDPARAMETER); }
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 206 "pl-lexer.l"
+#line 197 "pl-lexer.l"
{return(MAPFONT); }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 207 "pl-lexer.l"
+#line 198 "pl-lexer.l"
{return(FONTCHECKSUM); }
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 208 "pl-lexer.l"
+#line 199 "pl-lexer.l"
{return(FONTAT); }
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 209 "pl-lexer.l"
+#line 200 "pl-lexer.l"
{return(FONTDSIZE); }
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 210 "pl-lexer.l"
+#line 201 "pl-lexer.l"
{return(MAP); }
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 211 "pl-lexer.l"
+#line 202 "pl-lexer.l"
{return(SELECTFONT); }
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 212 "pl-lexer.l"
+#line 203 "pl-lexer.l"
{return(SETCHAR); }
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 213 "pl-lexer.l"
+#line 204 "pl-lexer.l"
{return(SETRULE); }
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 214 "pl-lexer.l"
+#line 205 "pl-lexer.l"
{return(PUSH); }
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 215 "pl-lexer.l"
+#line 206 "pl-lexer.l"
{return(POP); }
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 217 "pl-lexer.l"
+#line 208 "pl-lexer.l"
{yylval.yint = M_RIGHT; return(MOVE); }
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 218 "pl-lexer.l"
+#line 209 "pl-lexer.l"
{yylval.yint = M_LEFT; return(MOVE); }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 219 "pl-lexer.l"
+#line 210 "pl-lexer.l"
{yylval.yint = M_UP; return(MOVE); }
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 220 "pl-lexer.l"
+#line 211 "pl-lexer.l"
{yylval.yint = M_DOWN; return(MOVE); }
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 222 "pl-lexer.l"
+#line 213 "pl-lexer.l"
return(OFMLEVEL);
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 223 "pl-lexer.l"
+#line 214 "pl-lexer.l"
{yylval.yint = ACC_TOP; return(ACCENT); }
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 224 "pl-lexer.l"
+#line 215 "pl-lexer.l"
{yylval.yint = ACC_MID; return(ACCENT); }
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 225 "pl-lexer.l"
+#line 216 "pl-lexer.l"
{yylval.yint = ACC_BOT; return(ACCENT); }
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 227 "pl-lexer.l"
+#line 218 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_TL; return(FONTDIR);}
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 228 "pl-lexer.l"
+#line 219 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_LT; return(FONTDIR);}
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 229 "pl-lexer.l"
+#line 220 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_TR; return(FONTDIR);}
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 230 "pl-lexer.l"
+#line 221 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_LB; return(FONTDIR);}
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 231 "pl-lexer.l"
+#line 222 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_BL; return(FONTDIR);}
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 232 "pl-lexer.l"
+#line 223 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_RT; return(FONTDIR);}
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 233 "pl-lexer.l"
+#line 224 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_BR; return(FONTDIR);}
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 234 "pl-lexer.l"
+#line 225 "pl-lexer.l"
{yylval.yint = DIR_ORD+DIR_RB; return(FONTDIR);}
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 235 "pl-lexer.l"
+#line 226 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);}
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 236 "pl-lexer.l"
+#line 227 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);}
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 237 "pl-lexer.l"
+#line 228 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);}
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 238 "pl-lexer.l"
+#line 229 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);}
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 239 "pl-lexer.l"
+#line 230 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);}
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 240 "pl-lexer.l"
+#line 231 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);}
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 241 "pl-lexer.l"
+#line 232 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);}
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 242 "pl-lexer.l"
+#line 233 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);}
YY_BREAK
/* for compatibility with the omegaware versions */
case 132:
YY_RULE_SETUP
-#line 244 "pl-lexer.l"
+#line 235 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);}
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 245 "pl-lexer.l"
+#line 236 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);}
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 246 "pl-lexer.l"
+#line 237 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);}
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 247 "pl-lexer.l"
+#line 238 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);}
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 248 "pl-lexer.l"
+#line 239 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);}
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 249 "pl-lexer.l"
+#line 240 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);}
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 250 "pl-lexer.l"
+#line 241 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);}
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 251 "pl-lexer.l"
+#line 242 "pl-lexer.l"
{yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);}
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 253 "pl-lexer.l"
+#line 244 "pl-lexer.l"
return(FONTIVALUE);
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 254 "pl-lexer.l"
+#line 245 "pl-lexer.l"
return(FONTFVALUE);
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 255 "pl-lexer.l"
+#line 246 "pl-lexer.l"
return(FONTMVALUE);
YY_BREAK
case 143:
YY_RULE_SETUP
-#line 256 "pl-lexer.l"
+#line 247 "pl-lexer.l"
return(FONTPENALTY);
YY_BREAK
case 144:
YY_RULE_SETUP
-#line 257 "pl-lexer.l"
+#line 248 "pl-lexer.l"
return(FONTRULE);
YY_BREAK
case 145:
YY_RULE_SETUP
-#line 258 "pl-lexer.l"
+#line 249 "pl-lexer.l"
return(FONTGLUE);
YY_BREAK
case 146:
YY_RULE_SETUP
-#line 260 "pl-lexer.l"
+#line 251 "pl-lexer.l"
return(IVALUE);
YY_BREAK
case 147:
YY_RULE_SETUP
-#line 261 "pl-lexer.l"
+#line 252 "pl-lexer.l"
return(FVALUE);
YY_BREAK
case 148:
YY_RULE_SETUP
-#line 262 "pl-lexer.l"
+#line 253 "pl-lexer.l"
return(MVALUE);
YY_BREAK
case 149:
YY_RULE_SETUP
-#line 263 "pl-lexer.l"
+#line 254 "pl-lexer.l"
return(PENALTY);
YY_BREAK
case 150:
YY_RULE_SETUP
-#line 264 "pl-lexer.l"
+#line 255 "pl-lexer.l"
return(RULE);
YY_BREAK
case 151:
YY_RULE_SETUP
-#line 265 "pl-lexer.l"
+#line 256 "pl-lexer.l"
return(GLUE);
YY_BREAK
case 152:
YY_RULE_SETUP
-#line 267 "pl-lexer.l"
+#line 258 "pl-lexer.l"
return(IVALUEVAL);
YY_BREAK
case 153:
YY_RULE_SETUP
-#line 268 "pl-lexer.l"
+#line 259 "pl-lexer.l"
return(FVALUEVAL);
YY_BREAK
case 154:
YY_RULE_SETUP
-#line 269 "pl-lexer.l"
+#line 260 "pl-lexer.l"
return(MVALUEVAL);
YY_BREAK
case 155:
YY_RULE_SETUP
-#line 270 "pl-lexer.l"
+#line 261 "pl-lexer.l"
return(PENALTYVAL);
YY_BREAK
case 156:
YY_RULE_SETUP
-#line 272 "pl-lexer.l"
+#line 263 "pl-lexer.l"
{ yylval.yint = RULE_WD; return(RULEMEASURE); }
YY_BREAK
case 157:
YY_RULE_SETUP
-#line 273 "pl-lexer.l"
+#line 264 "pl-lexer.l"
{ yylval.yint = RULE_HT; return(RULEMEASURE); }
YY_BREAK
case 158:
YY_RULE_SETUP
-#line 274 "pl-lexer.l"
+#line 265 "pl-lexer.l"
{ yylval.yint = RULE_DP; return(RULEMEASURE); }
YY_BREAK
case 159:
YY_RULE_SETUP
-#line 276 "pl-lexer.l"
+#line 267 "pl-lexer.l"
return(GLUEWD);
YY_BREAK
case 160:
YY_RULE_SETUP
-#line 277 "pl-lexer.l"
+#line 268 "pl-lexer.l"
{ yylval.yint = GLUE_STRETCH; return(GLUESHRINKSTRETCH); }
YY_BREAK
case 161:
YY_RULE_SETUP
-#line 278 "pl-lexer.l"
+#line 269 "pl-lexer.l"
{ yylval.yint = GLUE_SHRINK; return(GLUESHRINKSTRETCH); }
YY_BREAK
case 162:
YY_RULE_SETUP
-#line 280 "pl-lexer.l"
+#line 271 "pl-lexer.l"
return(GLUETYPE);
YY_BREAK
case 163:
YY_RULE_SETUP
-#line 281 "pl-lexer.l"
+#line 272 "pl-lexer.l"
return(GLUERULE);
YY_BREAK
case 164:
YY_RULE_SETUP
-#line 282 "pl-lexer.l"
+#line 273 "pl-lexer.l"
return(GLUECHAR);
YY_BREAK
case 165:
YY_RULE_SETUP
-#line 284 "pl-lexer.l"
+#line 275 "pl-lexer.l"
return(CHARIVALUE);
YY_BREAK
case 166:
YY_RULE_SETUP
-#line 285 "pl-lexer.l"
+#line 276 "pl-lexer.l"
return(CHARFVALUE);
YY_BREAK
case 167:
YY_RULE_SETUP
-#line 286 "pl-lexer.l"
+#line 277 "pl-lexer.l"
return(CHARMVALUE);
YY_BREAK
case 168:
YY_RULE_SETUP
-#line 287 "pl-lexer.l"
+#line 278 "pl-lexer.l"
return(CHARPENALTY);
YY_BREAK
case 169:
YY_RULE_SETUP
-#line 288 "pl-lexer.l"
+#line 279 "pl-lexer.l"
return(CHARRULE);
YY_BREAK
case 170:
YY_RULE_SETUP
-#line 289 "pl-lexer.l"
+#line 280 "pl-lexer.l"
return(CHARGLUE);
YY_BREAK
case 171:
YY_RULE_SETUP
-#line 291 "pl-lexer.l"
+#line 282 "pl-lexer.l"
return(CKRN);
YY_BREAK
case 172:
YY_RULE_SETUP
-#line 292 "pl-lexer.l"
+#line 283 "pl-lexer.l"
return(CGLUE);
YY_BREAK
case 173:
YY_RULE_SETUP
-#line 293 "pl-lexer.l"
+#line 284 "pl-lexer.l"
return(CPENALTY);
YY_BREAK
case 174:
YY_RULE_SETUP
-#line 294 "pl-lexer.l"
+#line 285 "pl-lexer.l"
return(CPENGLUE);
YY_BREAK
case 175:
YY_RULE_SETUP
-#line 295 "pl-lexer.l"
+#line 286 "pl-lexer.l"
return(CLABEL);
YY_BREAK
case 176:
YY_RULE_SETUP
-#line 297 "pl-lexer.l"
+#line 288 "pl-lexer.l"
return(CHARREPEAT);
YY_BREAK
case 177:
YY_RULE_SETUP
-#line 300 "pl-lexer.l"
+#line 291 "pl-lexer.l"
{yylval.yint = O_FILLL; return(GLUEORDER); }
YY_BREAK
case 178:
YY_RULE_SETUP
-#line 301 "pl-lexer.l"
+#line 292 "pl-lexer.l"
{yylval.yint = O_FILL; return(GLUEORDER); }
YY_BREAK
case 179:
YY_RULE_SETUP
-#line 302 "pl-lexer.l"
+#line 293 "pl-lexer.l"
{yylval.yint = O_FIL; return(GLUEORDER); }
YY_BREAK
case 180:
YY_RULE_SETUP
-#line 303 "pl-lexer.l"
+#line 294 "pl-lexer.l"
{yylval.yint = O_FI; return(GLUEORDER); }
YY_BREAK
case 181:
YY_RULE_SETUP
-#line 304 "pl-lexer.l"
+#line 295 "pl-lexer.l"
{yylval.yint = O_UNIT; return(GLUEORDER); }
YY_BREAK
case 182:
YY_RULE_SETUP
-#line 306 "pl-lexer.l"
+#line 297 "pl-lexer.l"
{yylval.yint = K_NORMAL; return(GLUEKIND); }
YY_BREAK
case 183:
YY_RULE_SETUP
-#line 307 "pl-lexer.l"
+#line 298 "pl-lexer.l"
{yylval.yint = K_ALEADERS; return(GLUEKIND); }
YY_BREAK
case 184:
YY_RULE_SETUP
-#line 308 "pl-lexer.l"
+#line 299 "pl-lexer.l"
{yylval.yint = K_CLEADERS; return(GLUEKIND); }
YY_BREAK
case 185:
YY_RULE_SETUP
-#line 309 "pl-lexer.l"
+#line 300 "pl-lexer.l"
{yylval.yint = K_XLEADERS; return(GLUEKIND); }
YY_BREAK
case 186:
YY_RULE_SETUP
-#line 311 "pl-lexer.l"
+#line 302 "pl-lexer.l"
{yylval.yint = C_SECWD; return(CHARMEASURE); }
YY_BREAK
case 187:
YY_RULE_SETUP
-#line 312 "pl-lexer.l"
+#line 303 "pl-lexer.l"
{yylval.yint = C_SECHT; return(CHARMEASURE); }
YY_BREAK
case 188:
YY_RULE_SETUP
-#line 313 "pl-lexer.l"
+#line 304 "pl-lexer.l"
{yylval.yint = C_SECDP; return(CHARMEASURE); }
YY_BREAK
case 189:
YY_RULE_SETUP
-#line 314 "pl-lexer.l"
+#line 305 "pl-lexer.l"
{yylval.yint = C_SECIC; return(CHARMEASURE); }
YY_BREAK
case 190:
YY_RULE_SETUP
-#line 316 "pl-lexer.l"
+#line 307 "pl-lexer.l"
{yylval.yint = C_P_TOPAXIS; return(CHARMEASURE); }
YY_BREAK
case 191:
YY_RULE_SETUP
-#line 317 "pl-lexer.l"
+#line 308 "pl-lexer.l"
{yylval.yint = C_P_TOPAXISBIs; return(CHARMEASURE); }
YY_BREAK
case 192:
YY_RULE_SETUP
-#line 318 "pl-lexer.l"
+#line 309 "pl-lexer.l"
{yylval.yint = C_P_BOTAXIS; return(CHARMEASURE); }
YY_BREAK
case 193:
YY_RULE_SETUP
-#line 319 "pl-lexer.l"
+#line 310 "pl-lexer.l"
{yylval.yint = C_P_BOTAXISBIS; return(CHARMEASURE); }
YY_BREAK
case 194:
YY_RULE_SETUP
-#line 320 "pl-lexer.l"
+#line 311 "pl-lexer.l"
{yylval.yint = C_P_MIDHOR; return(CHARMEASURE); }
YY_BREAK
case 195:
YY_RULE_SETUP
-#line 321 "pl-lexer.l"
+#line 312 "pl-lexer.l"
{yylval.yint = C_P_MIDVERT; return(CHARMEASURE); }
YY_BREAK
case 196:
YY_RULE_SETUP
-#line 322 "pl-lexer.l"
+#line 313 "pl-lexer.l"
{yylval.yint = C_P_BASESLANT; return(CHARMEASURE); }
YY_BREAK
case 197:
YY_RULE_SETUP
-#line 324 "pl-lexer.l"
+#line 315 "pl-lexer.l"
{yylval.yint = C_S_TOPAXIS; return(CHARMEASURE); }
YY_BREAK
case 198:
YY_RULE_SETUP
-#line 325 "pl-lexer.l"
+#line 316 "pl-lexer.l"
{yylval.yint = C_S_TOPAXISBIs; return(CHARMEASURE); }
YY_BREAK
case 199:
YY_RULE_SETUP
-#line 326 "pl-lexer.l"
+#line 317 "pl-lexer.l"
{yylval.yint = C_S_BOTAXIS; return(CHARMEASURE); }
YY_BREAK
case 200:
YY_RULE_SETUP
-#line 327 "pl-lexer.l"
+#line 318 "pl-lexer.l"
{yylval.yint = C_S_BOTAXISBIS; return(CHARMEASURE); }
YY_BREAK
case 201:
YY_RULE_SETUP
-#line 328 "pl-lexer.l"
+#line 319 "pl-lexer.l"
{yylval.yint = C_S_MIDHOR; return(CHARMEASURE); }
YY_BREAK
case 202:
YY_RULE_SETUP
-#line 329 "pl-lexer.l"
+#line 320 "pl-lexer.l"
{yylval.yint = C_S_MIDVERT; return(CHARMEASURE); }
YY_BREAK
case 203:
YY_RULE_SETUP
-#line 330 "pl-lexer.l"
+#line 321 "pl-lexer.l"
{yylval.yint = C_S_BASESLANT; return(CHARMEASURE); }
YY_BREAK
case 204:
YY_RULE_SETUP
-#line 332 "pl-lexer.l"
+#line 323 "pl-lexer.l"
{lex_error_1("unexpected character (%x); ignored",
yytext[0]);}
YY_BREAK
case 205:
YY_RULE_SETUP
-#line 334 "pl-lexer.l"
+#line 325 "pl-lexer.l"
ECHO;
YY_BREAK
-#line 2384 "pl-lexer.c"
+#line 2375 "pl-lexer.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -3364,7 +3355,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 334 "pl-lexer.l"
+#line 325 "pl-lexer.l"
diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.l b/Build/source/texk/web2c/omegafonts/pl-lexer.l
index a2fb448e23c..7f9c719eea2 100644
--- a/Build/source/texk/web2c/omegafonts/pl-lexer.l
+++ b/Build/source/texk/web2c/omegafonts/pl-lexer.l
@@ -23,17 +23,8 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
*/
-#include <string.h>
-#include <kpathsea/c-proto.h>
-#ifdef WIN32
-#if defined __MINGW32__
-#include <kpathsea/mingw32.h>
-#else
-#include <win32lib.h>
-#endif
-#endif
+#include <kpathsea/config.h>
#include "parser.h"
-#include "kpathsea/types.h"
#include "pl-parser.h"
#include "manifests.h"
#include "error_routines.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 18:21:11 +0000