diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/omegafonts | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/omegafonts')
-rw-r--r-- | Build/source/texk/web2c/omegafonts/ChangeLog | 38 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.am | 31 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.in | 34 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/char_routines.c | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/char_routines.h | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/dimen_routines.c | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/error_routines.c | 36 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/error_routines.h | 46 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/header_routines.c | 14 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/omfonts.c | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/out_routines.c | 32 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/out_routines.h | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/pl-lexer.c | 1192 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/pl-lexer.l | 15 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/pl-parser.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/pl-parser.y | 2 |
16 files changed, 779 insertions, 686 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index c8d63a34ffd..3ebfe628438 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,3 +1,41 @@ +2009-09-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + * header_routines.c (init_header): Call init_ofm_level() to + allow reading PL/VPL (ofm_level=-1) files. + +2009-09-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pl-parser.l: Accept NFONTDIR as alias for NATURALFONTDIR for + compatibility with omegaware (Web2C) versions. + +2009-08-27 Peter Breitenlohner <peb@mppmu.mpg.de> + + Avoid maximal compiler warnings. + + * char_routines.[ch] (check_existence_and_safety, + doublecheck_existence): Constify string params. + * error_routines.[ch]: Constify string params of all functions. + * header_routines.c (init_design_size): ANSI C definition. + ({init,set}_{coding_scheme,family}): Use xstrdup'ed string + literal to initialize non-const string (and later free it). + * omfonts.c (names_msg, suffixes, full_suffixes): Constify strings. + * out_routines.[ch] (character_measures, extensible_pieces, + ligature_commands, xerox_faces, named_parameters, + named_mathsy_parameters, named_mathex_parameters, type_directions, + actual_directions, accent_kinds, move_directions, rule_measures, + glue_shrink_stretch, glue_orders, glue_kinds): Constify strings. + (out): Constify string param. + * pl-lexer.l: (scan_string): Constify string param. + + * Makefile.am (INCLUDES): Add -DNOT_WEB2C, not to import from + ../lib/lib.h globals defined in ../lib/main.c. + * dimen_routines.c (delta): Remove unused global var. + +2009-08-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: omfonts must depend explicitly on KPATHSEA_DEPEND, + the implicit dependency via proglib is not enough. + 2009-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> Implement DVI specials in ovp/ovf character packets. diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am index 2c3455693e9..afe7082d8d2 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.am +++ b/Build/source/texk/web2c/omegafonts/Makefile.am @@ -3,18 +3,14 @@ ## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) +INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C AM_CFLAGS = $(WARNING_CFLAGS) AM_YFLAGS = -d -v proglib = ../lib/lib.a -# Automake automatically uses $(proglib)=../lib/lib.a as dependency. -# This does not work for the configure substitution $(KPATHSEA_LIBS), -# thus we let $(proglib) artificially depend on $(KPATHSEA_LIBS). -# # Rebuild $(proglib) -$(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c +$(proglib): ${top_srcdir}/lib/*.c cd ../lib && $(MAKE) $(AM_MAKEFLAGS) ## Rebuild libkpathsea @@ -64,6 +60,7 @@ omfonts_SOURCES = \ print_routines.h LDADD = $(proglib) $(KPATHSEA_LIBS) +omfonts_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) DISTCLEANFILES = pl-parser.output @@ -77,7 +74,7 @@ install-exec-hook: rm -f $$f$(EXEEXT) && \ $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \ done -unistall-hook: +uninstall-hook: for f in $(linked_programs); do \ rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \ done @@ -86,23 +83,21 @@ endif OTANGLE ## Tests ## -EXTRA_DIST = omfonts.test specialhex.test - -## Test data -## -EXTRA_DIST += tests/Cherokee.pl tests/OCherokee.ovp tests/specialhex.ovp - if OTANGLE if OMFONTS TESTS = omfonts.test specialhex.test endif OMFONTS endif OTANGLE +EXTRA_DIST = omfonts.test specialhex.test + +## omfonts.test +EXTRA_DIST += tests/Cherokee.pl tests/OCherokee.ovp DISTCLEANFILES += tests/Cherokee.tfm tests/OCherokee.ofm \ tests/OCherokee.opl tests/OCherokee.ovf \ - tests/xCherokee.pl tests/xOCherokee.ofm \ - tests/xOCherokee.opl tests/xOCherokee.ovp \ - tests/specialhex.ofm tests/specialhex.opl \ - tests/specialhex.ovf tests/xspecialhex.ofm \ - tests/xspecialhex.opl tests/xspecialhex.ovp + tests/xCherokee.* tests/xOCherokee.* +## specialhex.test +EXTRA_DIST += tests/specialhex.ovp +DISTCLEANFILES += tests/specialhex.ofm tests/specialhex.opl \ + tests/specialhex.ovf tests/xspecialhex.* diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index cda3e6a891e..191e7521583 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -41,7 +41,8 @@ subdir = omegafonts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \ pl-lexer.c pl-parser.c pl-parser.h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ + $(top_srcdir)/../../m4/kpse-asm.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-cross.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ @@ -87,7 +88,6 @@ am_omfonts_OBJECTS = char_routines.$(OBJEXT) dimen_routines.$(OBJEXT) \ omfonts_OBJECTS = $(am_omfonts_OBJECTS) omfonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = -omfonts_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -205,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -295,7 +296,7 @@ top_srcdir = @top_srcdir@ wlibs = @wlibs@ x_ext_lib = @x_ext_lib@ x_tool_libs = @x_tool_libs@ -INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) +INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C AM_CFLAGS = $(WARNING_CFLAGS) AM_YFLAGS = -d -v proglib = ../lib/lib.a @@ -335,16 +336,15 @@ omfonts_SOURCES = \ print_routines.h LDADD = $(proglib) $(KPATHSEA_LIBS) +omfonts_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) DISTCLEANFILES = pl-parser.output tests/Cherokee.tfm \ tests/OCherokee.ofm tests/OCherokee.opl tests/OCherokee.ovf \ - tests/xCherokee.pl tests/xOCherokee.ofm tests/xOCherokee.opl \ - tests/xOCherokee.ovp tests/specialhex.ofm tests/specialhex.opl \ - tests/specialhex.ovf tests/xspecialhex.ofm \ - tests/xspecialhex.opl tests/xspecialhex.ovp + tests/xCherokee.* tests/xOCherokee.* tests/specialhex.ofm \ + tests/specialhex.opl tests/specialhex.ovf tests/xspecialhex.* linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf +@OMFONTS_TRUE@@OTANGLE_TRUE@TESTS = omfonts.test specialhex.test EXTRA_DIST = omfonts.test specialhex.test tests/Cherokee.pl \ tests/OCherokee.ovp tests/specialhex.ovp -@OMFONTS_TRUE@@OTANGLE_TRUE@TESTS = omfonts.test specialhex.test all: all-am .SUFFIXES: @@ -700,6 +700,8 @@ maintainer-clean-generic: -rm -f pl-parser.h @OMFONTS_FALSE@install-exec-hook: @OTANGLE_FALSE@install-exec-hook: +@OMFONTS_FALSE@uninstall-hook: +@OTANGLE_FALSE@uninstall-hook: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am @@ -770,8 +772,9 @@ ps: ps-am ps-am: uninstall-am: uninstall-binPROGRAMS - -.MAKE: check-am install-am install-exec-am install-strip + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: check-am install-am install-exec-am install-strip uninstall-am .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-binPROGRAMS clean-generic clean-libtool ctags distclean \ @@ -785,15 +788,12 @@ uninstall-am: uninstall-binPROGRAMS installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-hook -# Automake automatically uses $(proglib)=../lib/lib.a as dependency. -# This does not work for the configure substitution $(KPATHSEA_LIBS), -# thus we let $(proglib) artificially depend on $(KPATHSEA_LIBS). -# # Rebuild $(proglib) -$(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c +$(proglib): ${top_srcdir}/lib/*.c cd ../lib && $(MAKE) $(AM_MAKEFLAGS) @KPATHSEA_RULE@ @@ -804,7 +804,7 @@ $(proglib): $(KPATHSEA_DEPEND) ${top_srcdir}/lib/*.c @OMFONTS_TRUE@@OTANGLE_TRUE@ rm -f $$f$(EXEEXT) && \ @OMFONTS_TRUE@@OTANGLE_TRUE@ $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \ @OMFONTS_TRUE@@OTANGLE_TRUE@ done -@OMFONTS_TRUE@@OTANGLE_TRUE@unistall-hook: +@OMFONTS_TRUE@@OTANGLE_TRUE@uninstall-hook: @OMFONTS_TRUE@@OTANGLE_TRUE@ for f in $(linked_programs); do \ @OMFONTS_TRUE@@OTANGLE_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \ @OMFONTS_TRUE@@OTANGLE_TRUE@ done diff --git a/Build/source/texk/web2c/omegafonts/char_routines.c b/Build/source/texk/web2c/omegafonts/char_routines.c index 0237c927ab5..cdcaf68ba6a 100644 --- a/Build/source/texk/web2c/omegafonts/char_routines.c +++ b/Build/source/texk/web2c/omegafonts/char_routines.c @@ -120,7 +120,7 @@ init_character(unsigned c, char_entry *ready_made) planes[plane][i] = NULL; } if (plane>plane_max) plane_max = plane; - if (index>char_max[plane]) char_max[plane] = index; + if (index>char_max[plane]) char_max[plane] = index; if (planes[plane][index] != NULL) { if (planes[plane][index]->defined == FALSE) { @@ -292,7 +292,7 @@ clear_ligature_entries(void) } void -check_existence_and_safety(unsigned c, unsigned g, string extra, string fmt) +check_existence_and_safety(unsigned c, unsigned g, const_string extra, const_string fmt) { char_entry *gentry = planes[g/PLANE][g%PLANE]; @@ -309,7 +309,7 @@ check_existence_and_safety(unsigned c, unsigned g, string extra, string fmt) } void -doublecheck_existence(unsigned g, string extra, char*fmt) +doublecheck_existence(unsigned g, const_string extra, const_string fmt) { char_entry *gentry = planes[g/PLANE][g%PLANE]; diff --git a/Build/source/texk/web2c/omegafonts/char_routines.h b/Build/source/texk/web2c/omegafonts/char_routines.h index bc8665f49eb..f817a56338d 100644 --- a/Build/source/texk/web2c/omegafonts/char_routines.h +++ b/Build/source/texk/web2c/omegafonts/char_routines.h @@ -70,13 +70,13 @@ extern void check_charlist_infinite_loops(void); extern void adjust_labels(boolean); extern void print_labels(void); extern void set_extensible_piece(unsigned,unsigned); -extern void check_existence_and_safety(unsigned,unsigned,string,string); +extern void check_existence_and_safety(unsigned,unsigned,const_string,const_string); extern void clear_ligature_entries(void); extern void doublecheck_extens(void); extern void print_extens(void); extern void build_exten_table(void); extern void retrieve_exten_table(unsigned char *); -extern void doublecheck_existence(unsigned, string,string); +extern void doublecheck_existence(unsigned, const_string,const_string); extern void output_ovf_chars(void); extern void print_packet(unsigned char *, unsigned); diff --git a/Build/source/texk/web2c/omegafonts/dimen_routines.c b/Build/source/texk/web2c/omegafonts/dimen_routines.c index d8aa3efbff6..3b47b6dc08d 100644 --- a/Build/source/texk/web2c/omegafonts/dimen_routines.c +++ b/Build/source/texk/web2c/omegafonts/dimen_routines.c @@ -133,7 +133,6 @@ print_measures(void) int next_d; int excess; -int delta; static int min_cover(int h, int d) diff --git a/Build/source/texk/web2c/omegafonts/error_routines.c b/Build/source/texk/web2c/omegafonts/error_routines.c index a727e26c397..b4a08a0ae90 100644 --- a/Build/source/texk/web2c/omegafonts/error_routines.c +++ b/Build/source/texk/web2c/omegafonts/error_routines.c @@ -33,7 +33,7 @@ They */ void -lex_error_0(string fmt) +lex_error_0(const_string fmt) { fprintf(stderr, "line %d (lexing): ", line_number); fprintf(stderr, fmt); @@ -41,7 +41,7 @@ lex_error_0(string fmt) } void -lex_error_1(string fmt, int item) +lex_error_1(const_string fmt, int item) { fprintf(stderr, "line %d (lexing): ", line_number); fprintf(stderr, fmt, item); @@ -49,7 +49,7 @@ lex_error_1(string fmt, int item) } void -lex_error_s(string fmt, string item) +lex_error_s(const_string fmt, const_string item) { fprintf(stderr, "line %d (lexing): ", line_number); fprintf(stderr, fmt, item); @@ -57,7 +57,7 @@ lex_error_s(string fmt, string item) } void -lex_error_s_1(string fmt, string item, int item1) +lex_error_s_1(const_string fmt, const_string item, int item1) { fprintf(stderr, "line %d (lexing): ", line_number); fprintf(stderr, fmt, item, item1); @@ -65,7 +65,7 @@ lex_error_s_1(string fmt, string item, int item1) } void -yyerror(string fmt) +yyerror(const_string fmt) { fprintf(stderr, "line %d (parsing): ", line_number); fprintf(stderr, fmt); @@ -74,7 +74,7 @@ yyerror(string fmt) void -warning_0(string fmt) +warning_0(const_string fmt) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt); @@ -82,7 +82,7 @@ warning_0(string fmt) } void -warning_1(string fmt, int item) +warning_1(const_string fmt, int item) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt, item); @@ -90,7 +90,7 @@ warning_1(string fmt, int item) } void -warning_2(string fmt, int item, int item2) +warning_2(const_string fmt, int item, int item2) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt, item, item2); @@ -98,7 +98,7 @@ warning_2(string fmt, int item, int item2) } void -warning_s(string fmt, string item) +warning_s(const_string fmt, const_string item) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt, item); @@ -106,7 +106,7 @@ warning_s(string fmt, string item) } void -warning_s_1(string fmt, string item, int item1) +warning_s_1(const_string fmt, const_string item, int item1) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt, item, item1); @@ -114,7 +114,7 @@ warning_s_1(string fmt, string item, int item1) } void -warning_s_2(string fmt, string item, int item1, int item2) +warning_s_2(const_string fmt, const_string item, int item1, int item2) { fprintf(stderr, "line %d (warning): ", line_number); fprintf(stderr, fmt, item, item1, item2); @@ -122,7 +122,7 @@ warning_s_2(string fmt, string item, int item1, int item2) } void -fatal_error_0(string fmt) +fatal_error_0(const_string fmt) { fprintf(stderr, "line %d (fatal): ", line_number); fprintf(stderr, fmt); @@ -131,7 +131,7 @@ fatal_error_0(string fmt) } void -fatal_error_1(string fmt, int item) +fatal_error_1(const_string fmt, int item) { fprintf(stderr, "line %d (fatal): ", line_number); fprintf(stderr, fmt, item); @@ -140,7 +140,7 @@ fatal_error_1(string fmt, int item) } void -fatal_error_2(string fmt, int item, int item2) +fatal_error_2(const_string fmt, int item, int item2) { fprintf(stderr, "line %d (fatal): ", line_number); fprintf(stderr, fmt, item, item2); @@ -149,7 +149,7 @@ fatal_error_2(string fmt, int item, int item2) } void -fatal_error_s(string fmt, string item) +fatal_error_s(const_string fmt, const_string item) { fprintf(stderr, "line %d (fatal): ", line_number); fprintf(stderr, fmt, item); @@ -158,7 +158,7 @@ fatal_error_s(string fmt, string item) } void -internal_error_0(string fmt) +internal_error_0(const_string fmt) { fprintf(stderr, "line %d (internal): ", line_number); fprintf(stderr, fmt); @@ -167,7 +167,7 @@ internal_error_0(string fmt) } void -internal_error_1(string fmt, int item) +internal_error_1(const_string fmt, int item) { fprintf(stderr, "line %d (internal): ", line_number); fprintf(stderr, fmt, item); @@ -176,7 +176,7 @@ internal_error_1(string fmt, int item) } void -internal_error_s(string fmt, string item) +internal_error_s(const_string fmt, const_string item) { fprintf(stderr, "line %d (internal): ", line_number); fprintf(stderr, fmt, item); diff --git a/Build/source/texk/web2c/omegafonts/error_routines.h b/Build/source/texk/web2c/omegafonts/error_routines.h index 6bd09db62f9..ada4867d69a 100644 --- a/Build/source/texk/web2c/omegafonts/error_routines.h +++ b/Build/source/texk/web2c/omegafonts/error_routines.h @@ -21,27 +21,25 @@ along with Omega; if not, write to the Free Software Foundation, Inc., */ -extern void lex_error_0(string); -extern void lex_error_1(string, int); -extern void lex_error_s(string, string); -extern void lex_error_s_1(string, string, int); - -extern void fatal_error_0(string); -extern void fatal_error_1(string, int); -extern void fatal_error_2(string, int, int); -extern void fatal_error_s(string, string); - -extern void yyerror(string); - -extern void warning_0(string); -extern void warning_1(string, int); -extern void warning_2(string, int, int); -extern void warning_s(string, string); -extern void warning_s_1(string, string, int); -extern void warning_s_2(string, string, int, int); - -extern void internal_error_0(string); -extern void internal_error_1(string, int); -extern void internal_error_s(string, string); - - +extern void lex_error_0(const_string); +extern void lex_error_1(const_string, int); +extern void lex_error_s(const_string, const_string); +extern void lex_error_s_1(const_string, const_string, int); + +extern void fatal_error_0(const_string); +extern void fatal_error_1(const_string, int); +extern void fatal_error_2(const_string, int, int); +extern void fatal_error_s(const_string, const_string); + +extern void yyerror(const_string); + +extern void warning_0(const_string); +extern void warning_1(const_string, int); +extern void warning_2(const_string, int, int); +extern void warning_s(const_string, const_string); +extern void warning_s_1(const_string, const_string, int); +extern void warning_s_2(const_string, const_string, int, int); + +extern void internal_error_0(const_string); +extern void internal_error_1(const_string, int); +extern void internal_error_s(const_string, const_string); diff --git a/Build/source/texk/web2c/omegafonts/header_routines.c b/Build/source/texk/web2c/omegafonts/header_routines.c index 994e5cbd708..3903090bc9e 100644 --- a/Build/source/texk/web2c/omegafonts/header_routines.c +++ b/Build/source/texk/web2c/omegafonts/header_routines.c @@ -252,7 +252,7 @@ calculate_check_sum(void) /* DESIGNSIZE */ void -init_design_size() +init_design_size(void) { design_size = 10*UNITY; design_size_specified = FALSE; @@ -314,7 +314,7 @@ set_design_units(fix du) void init_coding_scheme(void) { - coding_scheme = "UNSPECIFIED"; + coding_scheme = xstrdup("UNSPECIFIED"); coding_scheme_specified = FALSE; } @@ -323,8 +323,8 @@ set_coding_scheme(string sval) { if (coding_scheme_specified==TRUE) { warning_0("CODINGSCHEME previously defined; old value ignored"); - free(coding_scheme); coding_scheme=NULL; } + free(coding_scheme); coding_scheme = sval; if (!strncmp(coding_scheme, "TEX MATH SY", 11) || @@ -379,7 +379,7 @@ retrieve_coding_scheme(void) void init_family(void) { - family = "UNSPECIFIED"; + family = xstrdup("UNSPECIFIED"); family_specified = FALSE; } @@ -388,8 +388,8 @@ set_family(string sval) { if (family_specified==TRUE) { warning_0("FAMILY previously defined; old value ignored"); - free(family); family=NULL; } + free(family); family = sval; family_specified = TRUE; } @@ -462,15 +462,12 @@ retrieve_face(void) /* OFMLEVEL */ -#if 0 -/* Not yet used */ static void init_ofm_level(void) { ofm_level = OFM_TFM; ofm_level_specified = FALSE; } -#endif void set_ofm_level(unsigned level) @@ -562,6 +559,7 @@ calculate_seven_bit_safe_flag(void) void init_header(void) { + init_ofm_level(); init_header_word(); init_check_sum(); init_design_size(); diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index 48c44494eed..05918b1748d 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -90,7 +90,7 @@ static const_string names_program[PROG_NUM] = { "ofm2opl", "opl2ofm", "ovf2ovp", "ovp2ovf", "omfonts" }; static const_string *names_help[PROG_NUM] = { OFM2OPLHELP, OPL2OFMHELP, OVF2OVPHELP, OVP2OVFHELP, OMFONTSHELP }; -static string names_msg[PROG_NUM] = { +static const_string names_msg[PROG_NUM] = { "This is ofm2opl, Version 2.0", "This is opl2ofm, Version 2.0", "This is ovf2ovp, Version 2.0", @@ -100,8 +100,8 @@ static string names_msg[PROG_NUM] = { int no_files=0; string *files[3] = {NULL, NULL, NULL}; -string suffixes[3] = {NULL, NULL, NULL}; -string full_suffixes[3] = {NULL, NULL, NULL}; +const_string suffixes[3] = {NULL, NULL, NULL}; +const_string full_suffixes[3] = {NULL, NULL, NULL}; static struct option long_options[] = { {"verbose", 0, &verbose_option, 1}, diff --git a/Build/source/texk/web2c/omegafonts/out_routines.c b/Build/source/texk/web2c/omegafonts/out_routines.c index b360b9a9051..38c7947a6fb 100644 --- a/Build/source/texk/web2c/omegafonts/out_routines.c +++ b/Build/source/texk/web2c/omegafonts/out_routines.c @@ -32,7 +32,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc., /* Character measures */ -string character_measures[] = +const_string character_measures[] = { "CHARWD", "CHARHT", "CHARDP", "CHARIC", "SECWD", "SECHT", "SECDP", "SECIC", "PRIMTOPAXIS", "PRIMTOPAXISBIS", "PRIMBOTAXIS", "PRIMBOTAXISBIS", @@ -52,7 +52,7 @@ out_character_measure(unsigned measure) /* Extensible pieces */ -string extensible_pieces[] = +const_string extensible_pieces[] = { "TOP", "MID", "BOT", "REP", NULL }; void @@ -66,7 +66,7 @@ out_extensible_piece(unsigned piece) /* Ligature commands */ -string ligature_commands[] = +const_string ligature_commands[] = { "LIG", "LIG/", "/LIG", "/LIG/", NULL, "LIG/>", "/LIG>", "/LIG/>", NULL, NULL, NULL, "/LIG/>>", NULL }; @@ -83,7 +83,7 @@ out_ligature_command(unsigned command) /* Xerox faces */ -string xerox_faces[] = +const_string xerox_faces[] = { "MRR", "MIR", "BRR", "BIR", "LRR", "LIR", "MRC", "MIC", "BRC", "BIC", "LRC", "LIC", "MRE", "MIE", "BRE", "BIE", "LRE", "LIE", NULL }; @@ -99,7 +99,7 @@ print_xerox_face(int face) /* Named parameters */ -string named_parameters[] = +const_string named_parameters[] = { NULL, "SLANT", "SPACE", "STRETCH", "SHRINK", "XHEIGHT", "QUAD", "EXTRASPACE", NULL }; @@ -114,7 +114,7 @@ out_named_parameter(unsigned parameter) /* Named math symbol parameters */ -string named_mathsy_parameters[] = +const_string named_mathsy_parameters[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "NUM1", "NUM2", "NUM3", "DENOM1", "DENOM2", "SUP1", "SUP2", "SUP3", "SUB1", "SUB2", @@ -132,7 +132,7 @@ out_named_mathsy_parameter(unsigned parameter) /* Named math extension parameters */ -string named_mathex_parameters[] = +const_string named_mathex_parameters[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "DEFAULTRULETHICKNESS", "BIGOPSPACING1", "BIGOPSPACING2", "BIGOPSPACING3", @@ -150,10 +150,10 @@ out_named_mathex_parameter(unsigned parameter) /* Typesetting directions */ -string type_directions[] = +const_string type_directions[] = { "FONTDIR", "NATURALFONTDIR", NULL }; -string actual_directions[] = +const_string actual_directions[] = { "TL", "LT", "TR", "RT", "LB", "BL", "BR", "RB", NULL }; void @@ -168,7 +168,7 @@ out_type_direction(unsigned direction) /* Kinds of accents */ -string accent_kinds[] = +const_string accent_kinds[] = { NULL, "TOPACCENT", "MIDACCENT", "BOTACCENT", NULL }; void @@ -182,7 +182,7 @@ out_accent_kind(unsigned kind) /* Move directions */ -string move_directions[] = +const_string move_directions[] = { "MOVERIGHT", "MOVELEFT", "MOVEUP", "MOVEDOWN", NULL }; void @@ -196,7 +196,7 @@ out_move_direction(unsigned direction) /* Rule measures */ -string rule_measures[] = +const_string rule_measures[] = { "RULEWD", "RULEHT", "RULEDP", NULL }; void @@ -210,7 +210,7 @@ out_rule_measure(unsigned measure) /* Glue shrink or stretch */ -string glue_shrink_stretch[] = +const_string glue_shrink_stretch[] = { "GLUESHRINK", "GLUESTRETCH", NULL }; void @@ -225,7 +225,7 @@ out_shrink_stretch(unsigned shrink_stretch) /* Glue orders */ -string glue_orders[] = +const_string glue_orders[] = { "UNIT", "FI", "FIL", "FILL", "FILLL", NULL }; void @@ -239,7 +239,7 @@ out_glue_order(unsigned order) /* Glue kinds */ -string glue_kinds[] = +const_string glue_kinds[] = { "NORMAL", "ALEADERS", "CLEADERS", "ALEADERS", "XLEADERS", NULL }; void @@ -381,7 +381,7 @@ out_digits(unsigned counter) } void -out(string sval) +out(const_string sval) { fprintf(file_output, sval); } diff --git a/Build/source/texk/web2c/omegafonts/out_routines.h b/Build/source/texk/web2c/omegafonts/out_routines.h index 1026c5b4f71..4d48c8d4eff 100644 --- a/Build/source/texk/web2c/omegafonts/out_routines.h +++ b/Build/source/texk/web2c/omegafonts/out_routines.h @@ -21,8 +21,8 @@ along with Omega; if not, write to the Free Software Foundation, Inc., */ -extern string extensible_pieces[]; -extern string ligature_commands[]; +extern const_string extensible_pieces[]; +extern const_string ligature_commands[]; extern void out_character_measure(unsigned); extern void out_extensible_piece(unsigned); @@ -41,7 +41,7 @@ extern void out_as_fix(fix); extern void out_fix(fix); extern void out_hex(unsigned char); extern void out_digits(unsigned); -extern void out(string); +extern void out(const_string); extern void right(void); extern void left(void); extern void print_xerox_face(int); diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.c b/Build/source/texk/web2c/omegafonts/pl-lexer.c index d943c4e042a..b5031c2019e 100644 --- a/Build/source/texk/web2c/omegafonts/pl-lexer.c +++ b/Build/source/texk/web2c/omegafonts/pl-lexer.c @@ -378,8 +378,8 @@ static void yy_fatal_error (yyconst char msg[] ); (yy_more_offset) = 0; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 197 -#define YY_END_OF_BUFFER 198 +#define YY_NUM_RULES 205 +#define YY_END_OF_BUFFER 206 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -387,39 +387,40 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[257] = +static yyconst flex_int16_t yy_acclist[265] = { 0, - 9, 9, 198, 196, 197, 1, 196, 197, 2, 197, - 3, 196, 197, 4, 196, 197, 196, 197, 196, 197, - 196, 197, 196, 197, 196, 197, 196, 197, 196, 197, - 196, 197, 196, 197, 196, 197, 196, 197, 196, 197, - 196, 197, 196, 197, 196, 197, 196, 197, 196, 197, - 196, 197, 196, 197, 196, 197, 196, 197, 196, 197, - 196, 197, 1, 172, 42, 8, 8, 6, 171, 7, + 9, 9, 206, 204, 205, 1, 204, 205, 2, 205, + 3, 204, 205, 4, 204, 205, 204, 205, 204, 205, + 204, 205, 204, 205, 204, 205, 204, 205, 204, 205, + 204, 205, 204, 205, 204, 205, 204, 205, 204, 205, + 204, 205, 204, 205, 204, 205, 204, 205, 204, 205, + 204, 205, 204, 205, 204, 205, 204, 205, 204, 205, + 204, 205, 1, 180, 42, 8, 8, 6, 179, 7, 31, 44, 102, 41, 5, 107, 9, 43, 40, 46, - 163, 23, 170, 143, 45, 77, 78, 79, 106, 75, - 9, 142, 33, 32, 85, 86, 82, 83, 84, 173, + 171, 23, 178, 151, 45, 77, 78, 79, 106, 75, + 9, 150, 33, 32, 85, 86, 82, 83, 84, 181, - 47, 49, 164, 61, 67, 55, 60, 66, 54, 63, + 47, 49, 172, 61, 67, 55, 60, 66, 54, 63, 69, 57, 62, 68, 56, 59, 65, 53, 58, 64, - 52, 169, 30, 48, 180, 179, 181, 178, 70, 71, - 50, 38, 37, 39, 36, 167, 89, 90, 80, 81, - 11, 100, 139, 151, 24, 138, 110, 140, 174, 150, - 149, 148, 73, 12, 51, 16, 98, 141, 104, 105, - 15, 72, 88, 87, 35, 74, 175, 162, 161, 20, - 176, 165, 166, 14, 137, 13, 136, 156, 155, 154, - 27, 111, 109, 112, 177, 115, 28, 26, 101, 145, - 144, 114, 108, 146, 29, 193, 113, 91, 158, 157, - - 159, 168, 21, 76, 120, 122, 119, 117, 123, 121, - 116, 118, 133, 132, 134, 153, 34, 147, 186, 191, - 194, 189, 103, 17, 160, 22, 135, 152, 184, 187, - 182, 25, 10, 99, 195, 93, 94, 95, 96, 97, - 188, 192, 190, 185, 183, 128, 130, 127, 125, 131, - 129, 124, 126, 92, 18, 19 + 52, 177, 30, 48, 188, 187, 189, 186, 70, 71, + 50, 38, 37, 39, 36, 175, 89, 90, 80, 81, + 11, 100, 147, 159, 24, 146, 110, 148, 182, 158, + 157, 156, 73, 12, 51, 16, 98, 149, 104, 105, + 15, 72, 88, 87, 35, 74, 183, 170, 169, 20, + 184, 173, 174, 14, 145, 13, 144, 164, 163, 162, + 27, 111, 109, 112, 185, 115, 28, 26, 101, 153, + 152, 114, 108, 154, 29, 201, 113, 91, 166, 165, + + 167, 176, 21, 76, 120, 122, 119, 117, 123, 121, + 116, 118, 141, 140, 142, 161, 34, 155, 194, 199, + 202, 197, 103, 17, 168, 22, 143, 160, 136, 138, + 135, 133, 139, 137, 132, 134, 192, 195, 190, 25, + 10, 99, 203, 93, 94, 95, 96, 97, 196, 200, + 198, 193, 191, 128, 130, 127, 125, 131, 129, 124, + 126, 92, 18, 19 } ; -static yyconst flex_int16_t yy_accept[781] = +static yyconst flex_int16_t yy_accept[801] = { 0, 1, 2, 3, 4, 6, 9, 11, 14, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, @@ -430,82 +431,85 @@ static yyconst flex_int16_t yy_accept[781] = 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 65, 65, 65, 66, 66, 67, 68, + 65, 65, 65, 65, 65, 65, 65, 66, 66, 67, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 69, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 70, 70, 70, 70, 71, 71, 71, 72, 72, 73, - 74, 75, 75, 75, 75, 75, 75, 75, 76, 76, - 76, 76, 77, 77, 77, 77, 78, 78, 79, 79, + 69, 70, 70, 70, 70, 71, 71, 71, 72, 72, + 73, 74, 75, 75, 75, 75, 75, 75, 75, 75, + 76, 76, 76, 76, 77, 77, 77, 77, 78, 78, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 80, 80, 80, 80, 80, 80, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, + 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, + 80, 81, 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 83, 83, 84, 84, 84, - - 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 87, 88, 89, 89, 89, 89, 89, - 90, 91, 92, 93, 93, 93, 93, 93, 93, 93, - 93, 93, 93, 93, 93, 93, 94, 94, 94, 94, - 95, 95, 96, 97, 97, 98, 99, 100, 100, 100, - 101, 101, 101, 101, 101, 102, 103, 103, 103, 103, - 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, + 82, 82, 82, 82, 82, 82, 82, 83, 83, 84, + + 84, 84, 85, 85, 85, 85, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 87, 88, 89, 89, + 89, 89, 89, 90, 91, 92, 93, 93, 93, 93, + 93, 93, 93, 93, 93, 93, 93, 93, 93, 94, + 94, 94, 94, 95, 95, 96, 97, 97, 98, 99, + 100, 100, 100, 101, 101, 101, 101, 101, 102, 103, + 103, 103, 103, 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, - 104, 104, 104, 104, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 104, 104, 104, 104, 104, 104, 104, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 120, 121, 122, 122, 123, 123, 123, 123, 123, 123, + 117, 118, 119, 120, 121, 122, 122, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 124, 125, 125, 125, 125, 125, 125, + 123, 123, 123, 123, 123, 123, 124, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 126, 127, 128, - 128, 128, 129, 129, 129, 129, 129, 129, 130, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 132, - 132, 132, 132, 132, 132, 132, 133, 133, 133, 134, - 135, 135, 135, 135, 135, 135, 136, 136, 137, 137, - 137, 137, 137, 137, 137, 138, 139, 140, 141, 141, - - 141, 142, 142, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 144, 144, 144, 144, 144, 144, - 145, 146, 147, 147, 147, 147, 147, 147, 147, 148, - 149, 149, 149, 150, 150, 150, 150, 150, 150, 150, - 150, 151, 152, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 154, 154, 154, 154, 154, 154, 154, 155, - 155, 155, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 157, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 126, 127, 128, 128, 128, 129, 129, 129, 129, + 129, 129, 130, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 132, 132, 132, 132, 132, 132, 132, + 133, 133, 133, 134, 135, 135, 135, 135, 135, 135, + 136, 136, 137, 137, 137, 137, 137, 137, 137, 138, + + 139, 140, 141, 141, 141, 142, 142, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 144, 144, + 144, 144, 144, 144, 145, 146, 147, 147, 147, 147, + 147, 147, 147, 148, 149, 149, 149, 149, 150, 150, + 150, 150, 150, 150, 150, 150, 151, 152, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 154, 154, 154, + 154, 154, 154, 154, 155, 155, 155, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 160, 161, 161, 162, 163, 164, 165, + 165, 166, 167, 167, 168, 168, 168, 168, 168, 168, + 168, 169, 169, 169, 169, 169, 170, 171, 172, 172, + 173, 174, 174, 174, 174, 174, 175, 175, 175, 175, + 175, 175, 176, 176, 176, 177, 177, 178, 178, 179, + 180, 180, 180, 181, 181, 182, 182, 183, 184, 184, + 184, 184, 184, 184, 185, 185, 185, 185, 185, 185, - 157, 157, 157, 157, 157, 157, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 159, 159, 159, 159, - 159, 159, 159, 159, 159, 159, 159, 160, 161, 161, - 162, 163, 164, 165, 165, 166, 167, 167, 168, 168, - 168, 168, 168, 168, 168, 169, 169, 169, 169, 169, - 170, 171, 172, 172, 173, 174, 174, 174, 174, 174, - 175, 175, 175, 175, 175, 175, 176, 176, 176, 177, - 177, 178, 178, 179, 180, 180, 180, 181, 181, 182, - 182, 183, 184, 184, 184, 184, 184, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 186, 186, 186, 187, 187, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188, 188, 188, 189, 189, + 189, 189, 189, 190, 190, 190, 190, 190, 191, 191, + 191, 192, 193, 194, 195, 195, 195, 195, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 197, 197, 197, + 197, 197, 197, 198, 199, 199, 199, 200, 201, 202, + 202, 203, 203, 203, 204, 204, 205, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 216, + 217, 217, 217, 218, 218, 218, 218, 218, 219, 219, + + 219, 220, 220, 220, 220, 221, 222, 223, 224, 224, + 225, 225, 225, 226, 226, 226, 227, 227, 228, 229, + 229, 230, 231, 232, 233, 234, 235, 236, 237, 237, + 238, 239, 240, 240, 240, 240, 240, 240, 241, 242, + 242, 243, 243, 243, 243, 243, 244, 244, 244, 244, + 245, 246, 247, 248, 249, 249, 249, 250, 250, 250, + 251, 252, 252, 252, 252, 253, 254, 254, 254, 254, + 254, 254, 254, 254, 254, 254, 254, 254, 255, 256, + 257, 258, 259, 260, 261, 262, 262, 262, 262, 262, + 262, 262, 262, 263, 263, 263, 263, 264, 265, 265 - 185, 185, 185, 185, 186, 186, 186, 187, 187, 188, - 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, - 188, 189, 189, 189, 189, 189, 190, 190, 190, 190, - 190, 191, 191, 191, 192, 193, 194, 195, 195, 195, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, - 197, 197, 197, 197, 197, 198, 199, 199, 199, 200, - 201, 202, 202, 203, 203, 203, 204, 204, 205, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 216, 217, 217, 217, 218, 219, 219, 219, 220, - 220, 220, 220, 221, 222, 223, 224, 224, 225, 225, - - 225, 226, 226, 226, 227, 227, 228, 229, 229, 229, - 230, 231, 232, 232, 232, 232, 232, 232, 233, 234, - 234, 235, 235, 235, 235, 235, 236, 236, 236, 236, - 237, 238, 239, 240, 241, 241, 241, 242, 242, 242, - 243, 244, 244, 244, 244, 245, 246, 246, 246, 246, - 246, 246, 246, 246, 246, 246, 246, 246, 247, 248, - 249, 250, 251, 252, 253, 254, 254, 254, 254, 254, - 254, 254, 254, 255, 255, 255, 255, 256, 257, 257 } ; static yyconst flex_int32_t yy_ec[256] = @@ -549,386 +553,396 @@ static yyconst flex_int32_t yy_meta[42] = 1 } ; -static yyconst flex_int16_t yy_base[786] = +static yyconst flex_int16_t yy_base[806] = { 0, - 0, 0, 827, 828, 824, 828, 828, 828, 798, 15, - 18, 53, 42, 785, 44, 796, 43, 785, 788, 32, - 35, 61, 45, 68, 784, 69, 85, 789, 789, 33, - 29, 815, 791, 794, 789, 790, 23, 810, 784, 45, - 777, 71, 66, 788, 806, 73, 772, 97, 68, 779, - 776, 787, 767, 800, 784, 783, 770, 780, 774, 765, - 775, 757, 776, 757, 752, 757, 761, 786, 759, 753, - 756, 753, 758, 748, 764, 111, 749, 752, 95, 745, - 752, 759, 102, 40, 108, 744, 749, 740, 747, 750, - 749, 746, 751, 733, 736, 748, 735, 828, 761, 726, - - 728, 741, 730, 740, 740, 731, 727, 725, 751, 735, - 726, 720, 724, 715, 102, 103, 104, 726, 721, 718, - 709, 716, 721, 739, 720, 712, 828, 717, 123, 715, - 719, 714, 707, 697, 697, 703, 130, 134, 703, 712, - 711, 828, 699, 702, 705, 0, 147, 828, 703, 141, - 702, 119, 701, 696, 689, 690, 699, 698, 685, 694, - 140, 152, 697, 678, 693, 676, 685, 692, 159, 688, - 683, 675, 686, 684, 682, 163, 676, 828, 680, 680, - 670, 677, 151, 661, 668, 667, 671, 676, 171, 174, - 178, 179, 184, 187, 828, 665, 664, 204, 654, 206, - - 668, 652, 660, 670, 668, 654, 664, 182, 646, 648, - 653, 662, 828, 828, 828, 657, 649, 649, 75, 828, - 828, 0, 190, 140, 644, 639, 654, 647, 641, 650, - 650, 644, 631, 637, 636, 828, 629, 642, 637, 828, - 626, 828, 828, 627, 828, 828, 828, 626, 639, 828, - 633, 629, 632, 634, 637, 828, 631, 630, 616, 630, - 631, 828, 628, 615, 608, 617, 608, 136, 605, 620, - 135, 620, 605, 611, 616, 613, 606, 607, 606, 605, - 123, 167, 602, 596, 828, 828, 828, 828, 828, 828, - 828, 828, 828, 828, 828, 828, 828, 828, 828, 828, - - 828, 828, 589, 828, 149, 604, 188, 590, 599, 588, - 587, 606, 601, 585, 599, 595, 582, 195, 577, 596, - 582, 593, 828, 828, 595, 583, 592, 580, 588, 583, - 576, 585, 588, 587, 576, 565, 580, 565, 217, 574, - 568, 566, 561, 575, 560, 558, 828, 828, 828, 572, - 560, 828, 555, 572, 561, 569, 560, 828, 828, 568, - 565, 553, 552, 562, 563, 558, 554, 556, 560, 542, - 549, 542, 551, 538, 535, 828, 552, 532, 828, 828, - 550, 549, 536, 533, 536, 828, 526, 828, 528, 526, - 524, 523, 521, 521, 828, 828, 828, 828, 202, 524, - - 828, 533, 828, 532, 215, 527, 534, 514, 532, 531, - 519, 517, 518, 507, 526, 515, 508, 507, 508, 828, - 828, 501, 510, 501, 514, 496, 511, 509, 828, 494, - 503, 496, 828, 507, 492, 486, 491, 489, 503, 491, - 828, 828, 828, 500, 503, 218, 502, 496, 484, 495, - 490, 828, 487, 489, 481, 480, 489, 476, 828, 473, - 474, 828, 472, 482, 487, 474, 462, 480, 473, 478, - 471, 470, 479, 474, 473, 465, 458, 472, 828, 450, - 468, 455, 462, 457, 468, 467, 464, 461, 479, 439, - 452, 457, 450, 449, 454, 457, 452, 455, 438, 449, - - 444, 447, 446, 449, 444, 828, 435, 434, 427, 437, - 443, 437, 435, 430, 435, 418, 433, 436, 221, 435, - 417, 411, 419, 427, 408, 416, 828, 828, 410, 420, - 828, 828, 828, 414, 828, 828, 408, 828, 417, 421, - 404, 419, 404, 400, 828, 399, 398, 406, 415, 828, - 828, 828, 407, 828, 828, 394, 388, 403, 408, 828, - 400, 396, 244, 403, 387, 828, 386, 385, 828, 393, - 828, 392, 828, 828, 389, 382, 828, 389, 828, 380, - 828, 828, 379, 386, 382, 390, 828, 377, 392, 374, - 368, 376, 384, 365, 376, 377, 368, 367, 374, 369, - - 363, 375, 360, 828, 359, 368, 828, 368, 828, 370, - 369, 368, 353, 352, 365, 358, 363, 348, 361, 347, - 828, 223, 231, 233, 226, 828, 359, 358, 357, 342, - 828, 350, 356, 828, 828, 828, 828, 345, 340, 828, - 345, 344, 345, 336, 335, 342, 349, 331, 828, 329, - 329, 327, 344, 321, 828, 828, 330, 341, 828, 828, - 828, 317, 828, 328, 334, 828, 320, 828, 317, 828, - 828, 828, 828, 828, 828, 828, 828, 828, 828, 828, - 307, 828, 320, 308, 828, 828, 321, 303, 828, 298, - 298, 297, 304, 828, 303, 828, 298, 828, 296, 285, - - 828, 296, 281, 828, 287, 828, 828, 294, 284, 294, - 828, 290, 272, 281, 280, 283, 262, 828, 828, 27, - 828, 83, 146, 164, 191, 828, 197, 218, 232, 828, - 828, 828, 828, 828, 232, 227, 828, 227, 229, 828, - 828, 237, 246, 265, 828, 828, 252, 244, 276, 257, - 252, 255, 265, 266, 258, 284, 266, 828, 828, 828, - 828, 828, 828, 828, 828, 288, 255, 275, 260, 261, - 269, 261, 828, 264, 278, 281, 828, 828, 828, 323, - 329, 334, 340, 344, 346 + 0, 0, 848, 849, 845, 849, 849, 849, 819, 15, + 18, 53, 42, 806, 44, 817, 43, 806, 809, 32, + 35, 65, 45, 72, 805, 64, 88, 810, 810, 33, + 29, 836, 812, 815, 810, 811, 23, 831, 805, 54, + 798, 71, 70, 809, 827, 77, 793, 89, 75, 800, + 797, 808, 788, 821, 805, 804, 791, 801, 795, 786, + 796, 778, 797, 778, 773, 781, 777, 781, 806, 779, + 773, 776, 773, 778, 768, 784, 119, 769, 772, 101, + 765, 772, 779, 101, 80, 109, 764, 769, 760, 767, + 770, 769, 766, 771, 753, 756, 768, 755, 849, 781, + + 746, 748, 761, 750, 760, 760, 751, 747, 745, 771, + 755, 746, 740, 744, 735, 104, 106, 108, 746, 741, + 738, 729, 736, 741, 759, 740, 732, 849, 737, 43, + 735, 739, 734, 727, 717, 717, 722, 722, 132, 136, + 722, 731, 730, 849, 718, 721, 724, 0, 128, 849, + 722, 133, 721, 133, 720, 715, 708, 709, 718, 717, + 704, 713, 144, 162, 716, 697, 712, 695, 704, 711, + 151, 707, 702, 694, 705, 703, 701, 166, 695, 849, + 699, 699, 689, 696, 139, 680, 687, 686, 690, 695, + 144, 159, 160, 177, 181, 182, 849, 684, 683, 199, + + 673, 201, 687, 671, 679, 689, 687, 673, 683, 211, + 665, 667, 672, 663, 680, 849, 849, 849, 675, 667, + 667, 177, 849, 849, 0, 187, 196, 662, 657, 672, + 665, 659, 668, 668, 662, 649, 655, 654, 849, 647, + 660, 655, 849, 644, 849, 849, 645, 849, 849, 849, + 644, 657, 849, 651, 647, 650, 652, 655, 849, 649, + 648, 634, 648, 649, 849, 646, 633, 626, 635, 626, + 150, 623, 638, 139, 638, 623, 629, 634, 631, 624, + 625, 624, 623, 86, 174, 620, 614, 849, 849, 849, + 849, 849, 849, 849, 849, 849, 849, 849, 849, 849, + + 849, 849, 849, 849, 849, 607, 849, 173, 622, 208, + 608, 617, 606, 605, 624, 619, 603, 617, 613, 600, + 38, 595, 614, 600, 611, 849, 849, 613, 601, 610, + 598, 606, 601, 594, 603, 606, 605, 601, 593, 582, + 597, 582, 220, 591, 585, 583, 578, 592, 577, 575, + 849, 849, 849, 589, 577, 849, 572, 589, 578, 586, + 577, 849, 849, 585, 582, 570, 569, 579, 580, 575, + 571, 573, 577, 559, 566, 559, 568, 555, 552, 849, + 569, 549, 849, 849, 567, 566, 553, 550, 553, 849, + 543, 849, 545, 543, 541, 540, 538, 538, 849, 849, + + 849, 849, 207, 541, 849, 550, 849, 549, 212, 544, + 551, 531, 549, 548, 536, 534, 535, 524, 543, 532, + 525, 524, 525, 849, 849, 518, 527, 518, 531, 513, + 528, 526, 849, 511, 520, 513, 520, 849, 523, 508, + 502, 507, 505, 519, 507, 849, 849, 849, 516, 519, + 222, 518, 512, 500, 511, 506, 849, 503, 505, 497, + 496, 505, 492, 849, 489, 490, 849, 488, 498, 503, + 490, 478, 496, 489, 494, 487, 486, 495, 490, 489, + 481, 474, 488, 849, 466, 484, 471, 478, 473, 484, + 483, 480, 477, 495, 455, 468, 473, 466, 465, 470, + + 473, 468, 471, 454, 465, 460, 463, 462, 465, 460, + 849, 451, 450, 443, 453, 459, 453, 451, 440, 445, + 450, 433, 448, 451, 224, 450, 432, 426, 434, 442, + 423, 431, 849, 849, 425, 435, 849, 849, 849, 429, + 849, 849, 423, 849, 432, 436, 419, 434, 419, 415, + 849, 414, 413, 421, 430, 849, 849, 849, 422, 849, + 849, 409, 403, 418, 423, 849, 415, 411, 247, 418, + 402, 849, 401, 400, 849, 408, 849, 407, 849, 849, + 404, 397, 849, 404, 849, 395, 849, 849, 394, 401, + 397, 405, 423, 849, 391, 406, 388, 382, 390, 398, + + 379, 390, 391, 382, 381, 388, 383, 377, 389, 374, + 849, 373, 382, 849, 382, 849, 384, 383, 382, 367, + 366, 379, 372, 377, 362, 375, 361, 849, 143, 233, + 234, 190, 849, 373, 372, 371, 356, 849, 364, 370, + 849, 849, 849, 849, 359, 354, 252, 849, 359, 358, + 359, 350, 349, 356, 363, 345, 849, 343, 343, 341, + 358, 335, 849, 849, 344, 350, 849, 849, 849, 324, + 849, 335, 337, 849, 323, 849, 317, 849, 849, 849, + 849, 849, 849, 849, 849, 849, 849, 849, 312, 849, + 322, 307, 849, 229, 237, 240, 230, 849, 324, 306, + + 849, 304, 304, 308, 318, 849, 317, 849, 312, 849, + 309, 296, 849, 307, 292, 849, 298, 849, 849, 304, + 849, 849, 849, 849, 849, 849, 849, 849, 103, 191, + 849, 211, 218, 235, 239, 245, 278, 849, 849, 243, + 849, 246, 238, 251, 252, 849, 244, 247, 261, 849, + 849, 849, 849, 849, 259, 253, 849, 259, 260, 849, + 849, 268, 277, 295, 849, 849, 281, 273, 298, 278, + 273, 276, 286, 287, 279, 305, 287, 849, 849, 849, + 849, 849, 849, 849, 849, 308, 277, 296, 281, 281, + 290, 282, 849, 285, 299, 302, 849, 849, 849, 343, + + 349, 354, 360, 364, 366 } ; -static yyconst flex_int16_t yy_def[786] = +static yyconst flex_int16_t yy_def[806] = { 0, - 779, 1, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 780, 779, 779, - 779, 779, 779, 779, 781, 779, 779, 779, 779, 779, - 779, 779, 779, 782, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 783, 779, 779, - 779, 779, 779, 779, 779, 784, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 780, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 781, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 782, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 785, 784, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 785, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 0, 779, - 779, 779, 779, 779, 779 + 799, 1, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 800, 799, 799, + 799, 799, 799, 799, 801, 799, 799, 799, 799, 799, + 799, 799, 799, 802, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 803, 799, + 799, 799, 799, 799, 799, 799, 804, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 800, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 801, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 802, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 805, 804, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 805, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 0, 799, + + 799, 799, 799, 799, 799 } ; -static yyconst flex_int16_t yy_nxt[870] = +static yyconst flex_int16_t yy_nxt[891] = { 0, 4, 5, 6, 7, 8, 4, 4, 9, 4, 4, 4, 4, 4, 4, 4, 4, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 4, 31, 4, - 4, 34, 36, 45, 54, 48, 68, 37, 58, 88, - 735, 60, 90, 35, 38, 91, 59, 96, 97, 61, - 49, 101, 46, 55, 62, 102, 69, 89, 50, 159, - 76, 63, 160, 51, 76, 39, 40, 64, 41, 42, - 52, 65, 43, 44, 70, 106, 118, 104, 71, 77, - 66, 105, 339, 107, 110, 119, 67, 72, 48, 111, - - 73, 112, 340, 74, 78, 79, 113, 736, 80, 341, - 81, 82, 76, 150, 115, 83, 76, 146, 157, 84, - 85, 151, 158, 116, 117, 161, 189, 191, 193, 152, - 204, 153, 395, 396, 190, 192, 194, 232, 162, 213, - 214, 215, 138, 138, 138, 138, 138, 138, 779, 242, - 243, 233, 779, 146, 380, 384, 345, 205, 224, 244, - 225, 245, 246, 247, 226, 227, 255, 278, 228, 346, - 385, 248, 381, 279, 256, 229, 397, 398, 230, 263, - 737, 402, 264, 403, 265, 266, 267, 268, 738, 285, - 269, 286, 288, 270, 289, 271, 291, 294, 292, 295, - - 272, 328, 297, 287, 298, 300, 290, 301, 329, 342, - 293, 296, 405, 343, 330, 739, 299, 331, 417, 302, - 305, 406, 306, 307, 316, 308, 309, 344, 310, 418, - 740, 311, 312, 437, 313, 483, 314, 484, 317, 318, - 319, 523, 488, 320, 592, 563, 438, 489, 672, 670, - 674, 741, 676, 742, 524, 671, 743, 593, 677, 744, - 745, 622, 746, 747, 748, 673, 749, 675, 750, 751, - 623, 730, 731, 732, 733, 734, 624, 749, 625, 756, - 757, 758, 760, 762, 764, 766, 767, 759, 770, 766, - 765, 771, 772, 752, 773, 774, 775, 776, 777, 761, - - 763, 778, 753, 729, 728, 727, 726, 725, 754, 768, - 755, 724, 723, 722, 721, 720, 719, 718, 717, 716, - 715, 714, 769, 98, 98, 713, 98, 98, 98, 98, - 109, 712, 711, 109, 109, 124, 710, 709, 124, 124, - 124, 138, 708, 707, 138, 147, 706, 147, 147, 147, - 222, 222, 705, 704, 703, 702, 701, 700, 699, 698, - 697, 696, 695, 694, 693, 692, 691, 690, 689, 688, - 687, 686, 685, 684, 683, 682, 681, 680, 679, 678, - 669, 668, 667, 666, 665, 664, 663, 662, 661, 660, - 659, 658, 657, 656, 655, 654, 653, 652, 651, 650, - - 649, 648, 647, 646, 645, 644, 643, 642, 641, 640, - 639, 638, 637, 636, 635, 634, 633, 632, 631, 630, - 629, 628, 627, 626, 621, 620, 619, 618, 617, 616, - 615, 614, 613, 612, 611, 610, 609, 608, 607, 606, - 605, 604, 603, 602, 601, 600, 599, 598, 597, 596, - 595, 594, 591, 590, 589, 588, 587, 586, 585, 584, - 583, 582, 581, 580, 579, 578, 577, 576, 575, 574, - 573, 572, 571, 570, 569, 568, 567, 566, 565, 564, - 563, 562, 561, 560, 559, 558, 557, 556, 555, 554, - 553, 552, 551, 550, 549, 548, 547, 546, 545, 544, - - 543, 542, 541, 540, 539, 538, 537, 536, 535, 534, - 533, 532, 531, 530, 529, 528, 527, 526, 525, 522, - 521, 520, 519, 518, 517, 516, 515, 514, 513, 512, - 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, - 501, 500, 499, 498, 497, 496, 495, 494, 493, 492, - 491, 490, 487, 486, 485, 482, 481, 480, 479, 478, - 477, 476, 475, 474, 473, 472, 471, 470, 469, 468, - 467, 466, 465, 464, 463, 462, 461, 460, 459, 458, - 457, 456, 455, 454, 453, 452, 451, 450, 449, 448, - 447, 446, 445, 444, 443, 442, 441, 440, 439, 436, - - 435, 434, 433, 432, 431, 430, 429, 428, 427, 426, - 425, 424, 423, 422, 421, 420, 419, 416, 415, 414, - 413, 412, 411, 410, 409, 408, 407, 404, 401, 400, - 399, 394, 393, 392, 391, 390, 389, 388, 387, 386, - 383, 382, 379, 378, 377, 376, 375, 374, 373, 372, - 371, 370, 369, 368, 367, 366, 365, 364, 363, 362, - 361, 360, 359, 358, 357, 356, 355, 354, 353, 352, - 351, 350, 349, 348, 347, 338, 337, 336, 335, 334, - 333, 332, 327, 326, 325, 324, 323, 322, 321, 315, - 304, 303, 284, 283, 282, 281, 280, 277, 276, 275, - - 274, 273, 262, 261, 260, 259, 258, 257, 254, 253, - 252, 251, 250, 249, 241, 240, 239, 238, 237, 236, - 235, 234, 231, 223, 221, 220, 219, 218, 217, 216, - 212, 211, 210, 209, 208, 207, 206, 203, 202, 201, - 779, 200, 199, 198, 197, 196, 195, 188, 187, 186, - 185, 184, 779, 183, 182, 181, 180, 179, 178, 177, - 176, 175, 99, 174, 173, 172, 171, 170, 169, 168, - 167, 166, 165, 164, 163, 156, 155, 154, 149, 148, - 145, 144, 143, 142, 141, 140, 139, 68, 137, 136, - 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, - - 125, 54, 123, 122, 121, 120, 114, 45, 108, 103, - 100, 99, 95, 94, 93, 92, 32, 87, 86, 75, - 57, 56, 53, 47, 33, 32, 779, 3, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779 + 4, 34, 36, 45, 54, 48, 69, 37, 58, 89, + 206, 60, 91, 35, 38, 92, 59, 97, 98, 61, + 49, 421, 46, 55, 62, 77, 70, 90, 50, 77, + 102, 63, 422, 51, 103, 39, 40, 207, 41, 42, + 52, 64, 43, 44, 78, 65, 66, 105, 71, 107, + 48, 106, 72, 119, 67, 399, 400, 108, 111, 79, + + 68, 73, 120, 112, 74, 113, 116, 75, 80, 161, + 114, 81, 162, 82, 83, 117, 118, 159, 84, 152, + 77, 160, 85, 86, 77, 148, 163, 153, 191, 799, + 193, 743, 195, 799, 148, 154, 192, 155, 194, 164, + 196, 216, 217, 218, 140, 140, 140, 140, 140, 140, + 227, 235, 228, 245, 246, 281, 229, 230, 258, 388, + 231, 282, 288, 247, 289, 236, 259, 232, 384, 678, + 233, 248, 249, 250, 389, 679, 290, 291, 294, 292, + 295, 251, 266, 401, 402, 267, 385, 268, 269, 270, + 271, 293, 296, 272, 343, 297, 273, 298, 274, 300, + + 303, 301, 304, 275, 344, 406, 346, 407, 744, 299, + 347, 345, 349, 302, 305, 308, 684, 309, 310, 319, + 311, 312, 685, 313, 348, 350, 314, 315, 745, 316, + 331, 317, 409, 320, 321, 322, 442, 332, 323, 493, + 488, 410, 489, 333, 494, 529, 334, 599, 569, 443, + 680, 682, 746, 647, 723, 721, 727, 725, 530, 747, + 600, 722, 728, 748, 629, 749, 755, 681, 683, 694, + 756, 724, 757, 630, 726, 758, 759, 760, 695, 631, + 761, 632, 762, 763, 696, 764, 697, 750, 751, 752, + 753, 754, 765, 766, 767, 768, 769, 770, 771, 769, + + 776, 777, 778, 780, 782, 784, 786, 787, 779, 786, + 790, 785, 791, 792, 793, 772, 794, 795, 796, 797, + 781, 783, 798, 742, 773, 741, 740, 739, 738, 788, + 774, 737, 775, 736, 735, 734, 733, 732, 731, 730, + 729, 720, 789, 99, 99, 719, 99, 99, 99, 99, + 110, 718, 717, 110, 110, 125, 716, 715, 125, 125, + 125, 140, 714, 713, 140, 149, 712, 149, 149, 149, + 225, 225, 711, 710, 709, 708, 707, 706, 705, 704, + 703, 702, 701, 700, 699, 698, 693, 692, 691, 690, + 689, 688, 687, 686, 677, 676, 675, 674, 673, 672, + + 671, 670, 669, 668, 667, 666, 665, 664, 663, 662, + 661, 660, 659, 658, 657, 656, 655, 654, 653, 652, + 651, 650, 649, 648, 647, 646, 645, 644, 643, 642, + 641, 640, 639, 638, 637, 636, 635, 634, 633, 628, + 627, 626, 625, 624, 623, 622, 621, 620, 619, 618, + 617, 616, 615, 614, 613, 612, 611, 610, 609, 608, + 607, 606, 605, 604, 603, 602, 601, 598, 597, 596, + 595, 594, 593, 592, 591, 590, 589, 588, 587, 586, + 585, 584, 583, 582, 581, 580, 579, 578, 577, 576, + 575, 574, 573, 572, 571, 570, 569, 568, 567, 566, + + 565, 564, 563, 562, 561, 560, 559, 558, 557, 556, + 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, + 545, 544, 543, 542, 541, 540, 539, 538, 537, 536, + 535, 534, 533, 532, 531, 528, 527, 526, 525, 524, + 523, 522, 521, 520, 519, 518, 517, 516, 515, 514, + 513, 512, 511, 510, 509, 508, 507, 506, 505, 504, + 503, 502, 501, 500, 499, 498, 497, 496, 495, 492, + 491, 490, 487, 486, 485, 484, 483, 482, 481, 480, + 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, + 469, 468, 467, 466, 465, 464, 463, 462, 461, 460, + + 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, + 449, 448, 447, 446, 445, 444, 441, 440, 439, 438, + 437, 436, 435, 434, 433, 432, 431, 430, 429, 428, + 427, 426, 425, 424, 423, 420, 419, 418, 417, 416, + 415, 414, 413, 412, 411, 408, 405, 404, 403, 398, + 397, 396, 395, 394, 393, 392, 391, 390, 387, 386, + 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, + 373, 372, 371, 370, 369, 368, 367, 366, 365, 364, + 363, 362, 361, 360, 359, 358, 357, 356, 355, 354, + 353, 352, 351, 342, 341, 340, 339, 338, 337, 336, + + 335, 330, 329, 328, 327, 326, 325, 324, 318, 307, + 306, 287, 286, 285, 284, 283, 280, 279, 278, 277, + 276, 265, 264, 263, 262, 261, 260, 257, 256, 255, + 254, 253, 252, 244, 243, 242, 241, 240, 239, 238, + 237, 234, 226, 224, 223, 222, 221, 220, 219, 215, + 214, 213, 212, 211, 210, 209, 208, 205, 204, 203, + 799, 202, 201, 200, 199, 198, 197, 190, 189, 188, + 187, 186, 799, 185, 184, 183, 182, 181, 180, 179, + 178, 177, 100, 176, 175, 174, 173, 172, 171, 170, + 169, 168, 167, 166, 165, 158, 157, 156, 151, 150, + + 147, 146, 145, 144, 143, 142, 141, 69, 139, 138, + 137, 136, 135, 134, 133, 132, 131, 130, 129, 128, + 127, 126, 54, 124, 123, 122, 121, 115, 45, 109, + 104, 101, 100, 96, 95, 94, 93, 32, 88, 87, + 76, 57, 56, 53, 47, 33, 32, 799, 3, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799 } ; -static yyconst flex_int16_t yy_chk[870] = +static yyconst flex_int16_t yy_chk[891] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 11, 13, 17, 15, 23, 11, 20, 30, - 720, 21, 31, 10, 12, 31, 20, 37, 37, 21, - 15, 40, 13, 17, 21, 40, 23, 30, 15, 84, - 26, 21, 84, 15, 26, 12, 12, 22, 12, 12, - 15, 22, 12, 12, 24, 43, 49, 42, 24, 26, - 22, 42, 219, 43, 46, 49, 22, 24, 48, 46, - - 24, 46, 219, 24, 26, 27, 46, 722, 27, 219, - 27, 27, 76, 79, 48, 27, 76, 76, 83, 27, - 27, 79, 83, 48, 48, 85, 115, 116, 117, 79, - 129, 79, 281, 281, 115, 116, 117, 152, 85, 137, - 137, 137, 138, 138, 138, 138, 138, 138, 147, 161, - 161, 152, 147, 147, 268, 271, 224, 129, 150, 161, - 150, 162, 162, 162, 150, 150, 169, 183, 150, 224, - 271, 162, 268, 183, 169, 150, 282, 282, 150, 176, - 723, 305, 176, 305, 176, 176, 176, 176, 724, 189, - 176, 189, 190, 176, 190, 176, 191, 192, 191, 192, - - 176, 208, 193, 189, 193, 194, 190, 194, 208, 223, - 191, 192, 307, 223, 208, 725, 193, 208, 318, 194, - 198, 307, 198, 198, 200, 198, 198, 223, 198, 318, - 727, 198, 198, 339, 198, 399, 198, 399, 200, 200, - 200, 446, 405, 200, 519, 563, 339, 405, 623, 622, - 624, 728, 625, 729, 446, 622, 735, 519, 625, 736, - 738, 563, 739, 742, 743, 623, 744, 624, 747, 748, - 563, 717, 717, 717, 717, 717, 563, 749, 563, 750, - 751, 752, 753, 754, 755, 756, 757, 752, 767, 766, - 755, 768, 769, 749, 770, 771, 772, 774, 775, 753, - - 754, 776, 749, 716, 715, 714, 713, 712, 749, 766, - 749, 710, 709, 708, 705, 703, 702, 700, 699, 697, - 695, 693, 766, 780, 780, 692, 780, 780, 780, 780, - 781, 691, 690, 781, 781, 782, 688, 687, 782, 782, - 782, 783, 684, 683, 783, 784, 681, 784, 784, 784, - 785, 785, 669, 667, 665, 664, 662, 658, 657, 654, - 653, 652, 651, 650, 648, 647, 646, 645, 644, 643, - 642, 641, 639, 638, 633, 632, 630, 629, 628, 627, - 620, 619, 618, 617, 616, 615, 614, 613, 612, 611, - 610, 608, 606, 605, 603, 602, 601, 600, 599, 598, - - 597, 596, 595, 594, 593, 592, 591, 590, 589, 588, - 586, 585, 584, 583, 580, 578, 576, 575, 572, 570, - 568, 567, 565, 564, 562, 561, 559, 558, 557, 556, - 553, 549, 548, 547, 546, 544, 543, 542, 541, 540, - 539, 537, 534, 530, 529, 526, 525, 524, 523, 522, - 521, 520, 518, 517, 516, 515, 514, 513, 512, 511, - 510, 509, 508, 507, 505, 504, 503, 502, 501, 500, - 499, 498, 497, 496, 495, 494, 493, 492, 491, 490, - 489, 488, 487, 486, 485, 484, 483, 482, 481, 480, - 478, 477, 476, 475, 474, 473, 472, 471, 470, 469, - - 468, 467, 466, 465, 464, 463, 461, 460, 458, 457, - 456, 455, 454, 453, 451, 450, 449, 448, 447, 445, - 444, 440, 439, 438, 437, 436, 435, 434, 432, 431, - 430, 428, 427, 426, 425, 424, 423, 422, 419, 418, - 417, 416, 415, 414, 413, 412, 411, 410, 409, 408, - 407, 406, 404, 402, 400, 394, 393, 392, 391, 390, - 389, 387, 385, 384, 383, 382, 381, 378, 377, 375, - 374, 373, 372, 371, 370, 369, 368, 367, 366, 365, - 364, 363, 362, 361, 360, 357, 356, 355, 354, 353, - 351, 350, 346, 345, 344, 343, 342, 341, 340, 338, - - 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, - 327, 326, 325, 322, 321, 320, 319, 317, 316, 315, - 314, 313, 312, 311, 310, 309, 308, 306, 303, 284, - 283, 280, 279, 278, 277, 276, 275, 274, 273, 272, - 270, 269, 267, 266, 265, 264, 263, 261, 260, 259, - 258, 257, 255, 254, 253, 252, 251, 249, 248, 244, - 241, 239, 238, 237, 235, 234, 233, 232, 231, 230, - 229, 228, 227, 226, 225, 218, 217, 216, 212, 211, - 210, 209, 207, 206, 205, 204, 203, 202, 201, 199, - 197, 196, 188, 187, 186, 185, 184, 182, 181, 180, - - 179, 177, 175, 174, 173, 172, 171, 170, 168, 167, - 166, 165, 164, 163, 160, 159, 158, 157, 156, 155, - 154, 153, 151, 149, 145, 144, 143, 141, 140, 139, - 136, 135, 134, 133, 132, 131, 130, 128, 126, 125, - 124, 123, 122, 121, 120, 119, 118, 114, 113, 112, - 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, - 101, 100, 99, 97, 96, 95, 94, 93, 92, 91, - 90, 89, 88, 87, 86, 82, 81, 80, 78, 77, - 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, - 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, - - 55, 54, 53, 52, 51, 50, 47, 45, 44, 41, - 39, 38, 36, 35, 34, 33, 32, 29, 28, 25, - 19, 18, 16, 14, 9, 5, 3, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779, 779, - 779, 779, 779, 779, 779, 779, 779, 779, 779 + 130, 21, 31, 10, 12, 31, 20, 37, 37, 21, + 15, 321, 13, 17, 21, 26, 23, 30, 15, 26, + 40, 21, 321, 15, 40, 12, 12, 130, 12, 12, + 15, 22, 12, 12, 26, 22, 22, 42, 24, 43, + 48, 42, 24, 49, 22, 284, 284, 43, 46, 26, + + 22, 24, 49, 46, 24, 46, 48, 24, 27, 85, + 46, 27, 85, 27, 27, 48, 48, 84, 27, 80, + 77, 84, 27, 27, 77, 77, 86, 80, 116, 149, + 117, 729, 118, 149, 149, 80, 116, 80, 117, 86, + 118, 139, 139, 139, 140, 140, 140, 140, 140, 140, + 152, 154, 152, 163, 163, 185, 152, 152, 171, 274, + 152, 185, 191, 163, 191, 154, 171, 152, 271, 629, + 152, 164, 164, 164, 274, 629, 191, 192, 193, 192, + 193, 164, 178, 285, 285, 178, 271, 178, 178, 178, + 178, 192, 193, 178, 222, 194, 178, 194, 178, 195, + + 196, 195, 196, 178, 222, 308, 226, 308, 730, 194, + 226, 222, 227, 195, 196, 200, 632, 200, 200, 202, + 200, 200, 632, 200, 226, 227, 200, 200, 732, 200, + 210, 200, 310, 202, 202, 202, 343, 210, 202, 409, + 403, 310, 403, 210, 409, 451, 210, 525, 569, 343, + 630, 631, 733, 647, 695, 694, 697, 696, 451, 734, + 525, 694, 697, 735, 569, 736, 740, 630, 631, 647, + 742, 695, 743, 569, 696, 744, 745, 747, 647, 569, + 748, 569, 749, 755, 647, 756, 647, 737, 737, 737, + 737, 737, 758, 759, 762, 763, 764, 767, 768, 769, + + 770, 771, 772, 773, 774, 775, 776, 777, 772, 786, + 787, 775, 788, 789, 790, 769, 791, 792, 794, 795, + 773, 774, 796, 720, 769, 717, 715, 714, 712, 786, + 769, 711, 769, 709, 707, 705, 704, 703, 702, 700, + 699, 692, 786, 800, 800, 691, 800, 800, 800, 800, + 801, 689, 677, 801, 801, 802, 675, 673, 802, 802, + 802, 803, 672, 670, 803, 804, 666, 804, 804, 804, + 805, 805, 665, 662, 661, 660, 659, 658, 656, 655, + 654, 653, 652, 651, 650, 649, 646, 645, 640, 639, + 637, 636, 635, 634, 627, 626, 625, 624, 623, 622, + + 621, 620, 619, 618, 617, 615, 613, 612, 610, 609, + 608, 607, 606, 605, 604, 603, 602, 601, 600, 599, + 598, 597, 596, 595, 593, 592, 591, 590, 589, 586, + 584, 582, 581, 578, 576, 574, 573, 571, 570, 568, + 567, 565, 564, 563, 562, 559, 555, 554, 553, 552, + 550, 549, 548, 547, 546, 545, 543, 540, 536, 535, + 532, 531, 530, 529, 528, 527, 526, 524, 523, 522, + 521, 520, 519, 518, 517, 516, 515, 514, 513, 512, + 510, 509, 508, 507, 506, 505, 504, 503, 502, 501, + 500, 499, 498, 497, 496, 495, 494, 493, 492, 491, + + 490, 489, 488, 487, 486, 485, 483, 482, 481, 480, + 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, + 469, 468, 466, 465, 463, 462, 461, 460, 459, 458, + 456, 455, 454, 453, 452, 450, 449, 445, 444, 443, + 442, 441, 440, 439, 437, 436, 435, 434, 432, 431, + 430, 429, 428, 427, 426, 423, 422, 421, 420, 419, + 418, 417, 416, 415, 414, 413, 412, 411, 410, 408, + 406, 404, 398, 397, 396, 395, 394, 393, 391, 389, + 388, 387, 386, 385, 382, 381, 379, 378, 377, 376, + 375, 374, 373, 372, 371, 370, 369, 368, 367, 366, + + 365, 364, 361, 360, 359, 358, 357, 355, 354, 350, + 349, 348, 347, 346, 345, 344, 342, 341, 340, 339, + 338, 337, 336, 335, 334, 333, 332, 331, 330, 329, + 328, 325, 324, 323, 322, 320, 319, 318, 317, 316, + 315, 314, 313, 312, 311, 309, 306, 287, 286, 283, + 282, 281, 280, 279, 278, 277, 276, 275, 273, 272, + 270, 269, 268, 267, 266, 264, 263, 262, 261, 260, + 258, 257, 256, 255, 254, 252, 251, 247, 244, 242, + 241, 240, 238, 237, 236, 235, 234, 233, 232, 231, + 230, 229, 228, 221, 220, 219, 215, 214, 213, 212, + + 211, 209, 208, 207, 206, 205, 204, 203, 201, 199, + 198, 190, 189, 188, 187, 186, 184, 183, 182, 181, + 179, 177, 176, 175, 174, 173, 172, 170, 169, 168, + 167, 166, 165, 162, 161, 160, 159, 158, 157, 156, + 155, 153, 151, 147, 146, 145, 143, 142, 141, 138, + 137, 136, 135, 134, 133, 132, 131, 129, 127, 126, + 125, 124, 123, 122, 121, 120, 119, 115, 114, 113, + 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, + 102, 101, 100, 98, 97, 96, 95, 94, 93, 92, + 91, 90, 89, 88, 87, 83, 82, 81, 79, 78, + + 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, + 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, + 56, 55, 54, 53, 52, 51, 50, 47, 45, 44, + 41, 39, 38, 36, 35, 34, 33, 32, 29, 28, + 25, 19, 18, 16, 14, 9, 5, 3, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799, + 799, 799, 799, 799, 799, 799, 799, 799, 799, 799 } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[198] = +static yyconst flex_int32_t yy_rule_can_match_eol[206] = { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -939,7 +953,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[198] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, }; extern int yy_flex_debug; int yy_flex_debug = 0; @@ -973,7 +988,7 @@ char yytext[YYLMAX]; char *yytext_ptr; #line 1 "pl-lexer.l" #line 2 "pl-lexer.l" -/* pl.l: Lexical analysis of property list files. +/* pl-lexer.l: Lexical analysis of property list files. This file is part of Omega, which is based on the web2c distribution of TeX, @@ -1024,7 +1039,7 @@ char saved_text[MAX_PTR]; static void scan_int(unsigned); static void scan_char(void); static void scan_fix(void); -static void scan_string(char *, unsigned, unsigned); +static void scan_string(const char *, unsigned, unsigned); static void scan_hex_string(void); /* from kpathsea, but avoid including kpathsea header files */ @@ -1041,7 +1056,7 @@ extern char *xstrdup (const char *); /* For Solaris's lex, to increase tables sizes --RP */ /* Space before number keeps ancient flex happy. */ -#line 1045 "pl-lexer.c" +#line 1060 "pl-lexer.c" #define INITIAL 0 @@ -1226,7 +1241,7 @@ YY_DECL #line 83 "pl-lexer.l" -#line 1230 "pl-lexer.c" +#line 1245 "pl-lexer.c" if ( !(yy_init) ) { @@ -1284,14 +1299,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 780 ) + if ( yy_current_state >= 800 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_base[yy_current_state] != 828 ); + while ( yy_base[yy_current_state] != 849 ); yy_find_action: yy_current_state = *--(yy_state_ptr); @@ -1992,338 +2007,379 @@ YY_RULE_SETUP #line 241 "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 243 "pl-lexer.l" -return(FONTIVALUE); +{yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);} YY_BREAK case 133: YY_RULE_SETUP #line 244 "pl-lexer.l" -return(FONTFVALUE); +{yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);} YY_BREAK case 134: YY_RULE_SETUP #line 245 "pl-lexer.l" -return(FONTMVALUE); +{yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);} YY_BREAK case 135: YY_RULE_SETUP #line 246 "pl-lexer.l" -return(FONTPENALTY); +{yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);} YY_BREAK case 136: YY_RULE_SETUP #line 247 "pl-lexer.l" -return(FONTRULE); +{yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);} YY_BREAK case 137: YY_RULE_SETUP #line 248 "pl-lexer.l" -return(FONTGLUE); +{yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);} YY_BREAK case 138: YY_RULE_SETUP -#line 250 "pl-lexer.l" -return(IVALUE); +#line 249 "pl-lexer.l" +{yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);} YY_BREAK case 139: YY_RULE_SETUP -#line 251 "pl-lexer.l" -return(FVALUE); +#line 250 "pl-lexer.l" +{yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);} YY_BREAK case 140: YY_RULE_SETUP #line 252 "pl-lexer.l" -return(MVALUE); +return(FONTIVALUE); YY_BREAK case 141: YY_RULE_SETUP #line 253 "pl-lexer.l" -return(PENALTY); +return(FONTFVALUE); YY_BREAK case 142: YY_RULE_SETUP #line 254 "pl-lexer.l" -return(RULE); +return(FONTMVALUE); YY_BREAK case 143: YY_RULE_SETUP #line 255 "pl-lexer.l" -return(GLUE); +return(FONTPENALTY); YY_BREAK case 144: YY_RULE_SETUP -#line 257 "pl-lexer.l" -return(IVALUEVAL); +#line 256 "pl-lexer.l" +return(FONTRULE); YY_BREAK case 145: YY_RULE_SETUP -#line 258 "pl-lexer.l" -return(FVALUEVAL); +#line 257 "pl-lexer.l" +return(FONTGLUE); YY_BREAK case 146: YY_RULE_SETUP #line 259 "pl-lexer.l" -return(MVALUEVAL); +return(IVALUE); YY_BREAK case 147: YY_RULE_SETUP #line 260 "pl-lexer.l" -return(PENALTYVAL); +return(FVALUE); YY_BREAK case 148: YY_RULE_SETUP -#line 262 "pl-lexer.l" -{ yylval.yint = RULE_WD; return(RULEMEASURE); } +#line 261 "pl-lexer.l" +return(MVALUE); YY_BREAK case 149: YY_RULE_SETUP -#line 263 "pl-lexer.l" -{ yylval.yint = RULE_HT; return(RULEMEASURE); } +#line 262 "pl-lexer.l" +return(PENALTY); YY_BREAK case 150: YY_RULE_SETUP -#line 264 "pl-lexer.l" -{ yylval.yint = RULE_DP; return(RULEMEASURE); } +#line 263 "pl-lexer.l" +return(RULE); YY_BREAK case 151: YY_RULE_SETUP -#line 266 "pl-lexer.l" -return(GLUEWD); +#line 264 "pl-lexer.l" +return(GLUE); YY_BREAK case 152: YY_RULE_SETUP -#line 267 "pl-lexer.l" -{ yylval.yint = GLUE_STRETCH; return(GLUESHRINKSTRETCH); } +#line 266 "pl-lexer.l" +return(IVALUEVAL); YY_BREAK case 153: YY_RULE_SETUP -#line 268 "pl-lexer.l" -{ yylval.yint = GLUE_SHRINK; return(GLUESHRINKSTRETCH); } +#line 267 "pl-lexer.l" +return(FVALUEVAL); YY_BREAK case 154: YY_RULE_SETUP -#line 270 "pl-lexer.l" -return(GLUETYPE); +#line 268 "pl-lexer.l" +return(MVALUEVAL); YY_BREAK case 155: YY_RULE_SETUP -#line 271 "pl-lexer.l" -return(GLUERULE); +#line 269 "pl-lexer.l" +return(PENALTYVAL); YY_BREAK case 156: YY_RULE_SETUP -#line 272 "pl-lexer.l" -return(GLUECHAR); +#line 271 "pl-lexer.l" +{ yylval.yint = RULE_WD; return(RULEMEASURE); } YY_BREAK case 157: YY_RULE_SETUP -#line 274 "pl-lexer.l" -return(CHARIVALUE); +#line 272 "pl-lexer.l" +{ yylval.yint = RULE_HT; return(RULEMEASURE); } YY_BREAK case 158: YY_RULE_SETUP -#line 275 "pl-lexer.l" -return(CHARFVALUE); +#line 273 "pl-lexer.l" +{ yylval.yint = RULE_DP; return(RULEMEASURE); } YY_BREAK case 159: YY_RULE_SETUP -#line 276 "pl-lexer.l" -return(CHARMVALUE); +#line 275 "pl-lexer.l" +return(GLUEWD); YY_BREAK case 160: YY_RULE_SETUP -#line 277 "pl-lexer.l" -return(CHARPENALTY); +#line 276 "pl-lexer.l" +{ yylval.yint = GLUE_STRETCH; return(GLUESHRINKSTRETCH); } YY_BREAK case 161: YY_RULE_SETUP -#line 278 "pl-lexer.l" -return(CHARRULE); +#line 277 "pl-lexer.l" +{ yylval.yint = GLUE_SHRINK; return(GLUESHRINKSTRETCH); } YY_BREAK case 162: YY_RULE_SETUP #line 279 "pl-lexer.l" -return(CHARGLUE); +return(GLUETYPE); YY_BREAK case 163: YY_RULE_SETUP -#line 281 "pl-lexer.l" -return(CKRN); +#line 280 "pl-lexer.l" +return(GLUERULE); YY_BREAK case 164: YY_RULE_SETUP -#line 282 "pl-lexer.l" -return(CGLUE); +#line 281 "pl-lexer.l" +return(GLUECHAR); YY_BREAK case 165: YY_RULE_SETUP #line 283 "pl-lexer.l" -return(CPENALTY); +return(CHARIVALUE); YY_BREAK case 166: YY_RULE_SETUP #line 284 "pl-lexer.l" -return(CPENGLUE); +return(CHARFVALUE); YY_BREAK case 167: YY_RULE_SETUP #line 285 "pl-lexer.l" -return(CLABEL); +return(CHARMVALUE); YY_BREAK case 168: YY_RULE_SETUP -#line 287 "pl-lexer.l" -return(CHARREPEAT); +#line 286 "pl-lexer.l" +return(CHARPENALTY); YY_BREAK case 169: YY_RULE_SETUP -#line 290 "pl-lexer.l" -{yylval.yint = O_FILLL; return(GLUEORDER); } +#line 287 "pl-lexer.l" +return(CHARRULE); YY_BREAK case 170: YY_RULE_SETUP -#line 291 "pl-lexer.l" -{yylval.yint = O_FILL; return(GLUEORDER); } +#line 288 "pl-lexer.l" +return(CHARGLUE); YY_BREAK case 171: YY_RULE_SETUP -#line 292 "pl-lexer.l" -{yylval.yint = O_FIL; return(GLUEORDER); } +#line 290 "pl-lexer.l" +return(CKRN); YY_BREAK case 172: YY_RULE_SETUP -#line 293 "pl-lexer.l" -{yylval.yint = O_FI; return(GLUEORDER); } +#line 291 "pl-lexer.l" +return(CGLUE); YY_BREAK case 173: YY_RULE_SETUP -#line 294 "pl-lexer.l" -{yylval.yint = O_UNIT; return(GLUEORDER); } +#line 292 "pl-lexer.l" +return(CPENALTY); YY_BREAK case 174: YY_RULE_SETUP -#line 296 "pl-lexer.l" -{yylval.yint = K_NORMAL; return(GLUEKIND); } +#line 293 "pl-lexer.l" +return(CPENGLUE); YY_BREAK case 175: YY_RULE_SETUP -#line 297 "pl-lexer.l" -{yylval.yint = K_ALEADERS; return(GLUEKIND); } +#line 294 "pl-lexer.l" +return(CLABEL); YY_BREAK case 176: YY_RULE_SETUP -#line 298 "pl-lexer.l" -{yylval.yint = K_CLEADERS; return(GLUEKIND); } +#line 296 "pl-lexer.l" +return(CHARREPEAT); YY_BREAK case 177: YY_RULE_SETUP #line 299 "pl-lexer.l" -{yylval.yint = K_XLEADERS; return(GLUEKIND); } +{yylval.yint = O_FILLL; return(GLUEORDER); } YY_BREAK case 178: YY_RULE_SETUP -#line 301 "pl-lexer.l" -{yylval.yint = C_SECWD; return(CHARMEASURE); } +#line 300 "pl-lexer.l" +{yylval.yint = O_FILL; return(GLUEORDER); } YY_BREAK case 179: YY_RULE_SETUP -#line 302 "pl-lexer.l" -{yylval.yint = C_SECHT; return(CHARMEASURE); } +#line 301 "pl-lexer.l" +{yylval.yint = O_FIL; return(GLUEORDER); } YY_BREAK case 180: YY_RULE_SETUP -#line 303 "pl-lexer.l" -{yylval.yint = C_SECDP; return(CHARMEASURE); } +#line 302 "pl-lexer.l" +{yylval.yint = O_FI; return(GLUEORDER); } YY_BREAK case 181: YY_RULE_SETUP -#line 304 "pl-lexer.l" -{yylval.yint = C_SECIC; return(CHARMEASURE); } +#line 303 "pl-lexer.l" +{yylval.yint = O_UNIT; return(GLUEORDER); } YY_BREAK case 182: YY_RULE_SETUP -#line 306 "pl-lexer.l" -{yylval.yint = C_P_TOPAXIS; return(CHARMEASURE); } +#line 305 "pl-lexer.l" +{yylval.yint = K_NORMAL; return(GLUEKIND); } YY_BREAK case 183: YY_RULE_SETUP -#line 307 "pl-lexer.l" -{yylval.yint = C_P_TOPAXISBIs; return(CHARMEASURE); } +#line 306 "pl-lexer.l" +{yylval.yint = K_ALEADERS; return(GLUEKIND); } YY_BREAK case 184: YY_RULE_SETUP -#line 308 "pl-lexer.l" -{yylval.yint = C_P_BOTAXIS; return(CHARMEASURE); } +#line 307 "pl-lexer.l" +{yylval.yint = K_CLEADERS; return(GLUEKIND); } YY_BREAK case 185: YY_RULE_SETUP -#line 309 "pl-lexer.l" -{yylval.yint = C_P_BOTAXISBIS; return(CHARMEASURE); } +#line 308 "pl-lexer.l" +{yylval.yint = K_XLEADERS; return(GLUEKIND); } YY_BREAK case 186: YY_RULE_SETUP #line 310 "pl-lexer.l" -{yylval.yint = C_P_MIDHOR; return(CHARMEASURE); } +{yylval.yint = C_SECWD; return(CHARMEASURE); } YY_BREAK case 187: YY_RULE_SETUP #line 311 "pl-lexer.l" -{yylval.yint = C_P_MIDVERT; return(CHARMEASURE); } +{yylval.yint = C_SECHT; return(CHARMEASURE); } YY_BREAK case 188: YY_RULE_SETUP #line 312 "pl-lexer.l" -{yylval.yint = C_P_BASESLANT; return(CHARMEASURE); } +{yylval.yint = C_SECDP; return(CHARMEASURE); } YY_BREAK case 189: YY_RULE_SETUP -#line 314 "pl-lexer.l" -{yylval.yint = C_S_TOPAXIS; return(CHARMEASURE); } +#line 313 "pl-lexer.l" +{yylval.yint = C_SECIC; return(CHARMEASURE); } YY_BREAK case 190: YY_RULE_SETUP #line 315 "pl-lexer.l" -{yylval.yint = C_S_TOPAXISBIs; return(CHARMEASURE); } +{yylval.yint = C_P_TOPAXIS; return(CHARMEASURE); } YY_BREAK case 191: YY_RULE_SETUP #line 316 "pl-lexer.l" -{yylval.yint = C_S_BOTAXIS; return(CHARMEASURE); } +{yylval.yint = C_P_TOPAXISBIs; return(CHARMEASURE); } YY_BREAK case 192: YY_RULE_SETUP #line 317 "pl-lexer.l" -{yylval.yint = C_S_BOTAXISBIS; return(CHARMEASURE); } +{yylval.yint = C_P_BOTAXIS; return(CHARMEASURE); } YY_BREAK case 193: YY_RULE_SETUP #line 318 "pl-lexer.l" -{yylval.yint = C_S_MIDHOR; return(CHARMEASURE); } +{yylval.yint = C_P_BOTAXISBIS; return(CHARMEASURE); } YY_BREAK case 194: YY_RULE_SETUP #line 319 "pl-lexer.l" -{yylval.yint = C_S_MIDVERT; return(CHARMEASURE); } +{yylval.yint = C_P_MIDHOR; return(CHARMEASURE); } YY_BREAK case 195: YY_RULE_SETUP #line 320 "pl-lexer.l" -{yylval.yint = C_S_BASESLANT; return(CHARMEASURE); } +{yylval.yint = C_P_MIDVERT; return(CHARMEASURE); } YY_BREAK case 196: YY_RULE_SETUP -#line 322 "pl-lexer.l" -{lex_error_1("unexpected character (%x); ignored", - yytext[0]);} +#line 321 "pl-lexer.l" +{yylval.yint = C_P_BASESLANT; return(CHARMEASURE); } YY_BREAK case 197: YY_RULE_SETUP +#line 323 "pl-lexer.l" +{yylval.yint = C_S_TOPAXIS; return(CHARMEASURE); } + YY_BREAK +case 198: +YY_RULE_SETUP #line 324 "pl-lexer.l" +{yylval.yint = C_S_TOPAXISBIs; return(CHARMEASURE); } + YY_BREAK +case 199: +YY_RULE_SETUP +#line 325 "pl-lexer.l" +{yylval.yint = C_S_BOTAXIS; return(CHARMEASURE); } + YY_BREAK +case 200: +YY_RULE_SETUP +#line 326 "pl-lexer.l" +{yylval.yint = C_S_BOTAXISBIS; return(CHARMEASURE); } + YY_BREAK +case 201: +YY_RULE_SETUP +#line 327 "pl-lexer.l" +{yylval.yint = C_S_MIDHOR; return(CHARMEASURE); } + YY_BREAK +case 202: +YY_RULE_SETUP +#line 328 "pl-lexer.l" +{yylval.yint = C_S_MIDVERT; return(CHARMEASURE); } + YY_BREAK +case 203: +YY_RULE_SETUP +#line 329 "pl-lexer.l" +{yylval.yint = C_S_BASESLANT; return(CHARMEASURE); } + YY_BREAK +case 204: +YY_RULE_SETUP +#line 331 "pl-lexer.l" +{lex_error_1("unexpected character (%x); ignored", + yytext[0]);} + YY_BREAK +case 205: +YY_RULE_SETUP +#line 333 "pl-lexer.l" ECHO; YY_BREAK -#line 2327 "pl-lexer.c" +#line 2383 "pl-lexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2584,7 +2640,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 780 ) + if ( yy_current_state >= 800 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2607,11 +2663,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 780 ) + if ( yy_current_state >= 800 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 779); + yy_is_jam = (yy_current_state == 799); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -3307,7 +3363,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 324 "pl-lexer.l" +#line 333 "pl-lexer.l" @@ -3403,7 +3459,7 @@ scan_char(void) } static void -scan_string(char *attribute, unsigned keep, unsigned length) +scan_string(const char *attribute, unsigned keep, unsigned length) { register unsigned c, saved_ptr = 0, paren_level = 0; unsigned error_msg = FALSE; diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.l b/Build/source/texk/web2c/omegafonts/pl-lexer.l index bd17b8c2500..cfd63bfaf32 100644 --- a/Build/source/texk/web2c/omegafonts/pl-lexer.l +++ b/Build/source/texk/web2c/omegafonts/pl-lexer.l @@ -1,5 +1,5 @@ %{ -/* pl.l: Lexical analysis of property list files. +/* pl-lexer.l: Lexical analysis of property list files. This file is part of Omega, which is based on the web2c distribution of TeX, @@ -50,7 +50,7 @@ char saved_text[MAX_PTR]; static void scan_int(unsigned); static void scan_char(void); static void scan_fix(void); -static void scan_string(char *, unsigned, unsigned); +static void scan_string(const char *, unsigned, unsigned); static void scan_hex_string(void); /* from kpathsea, but avoid including kpathsea header files */ @@ -239,6 +239,15 @@ NATURALFONTDIR{ws}BL {yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);} NATURALFONTDIR{ws}RT {yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);} NATURALFONTDIR{ws}BR {yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);} NATURALFONTDIR{ws}RB {yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);} + /* for compatibility with the omegaware versions */ +NFONTDIR{ws}TL {yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);} +NFONTDIR{ws}LT {yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);} +NFONTDIR{ws}TR {yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);} +NFONTDIR{ws}LB {yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);} +NFONTDIR{ws}BL {yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);} +NFONTDIR{ws}RT {yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);} +NFONTDIR{ws}BR {yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);} +NFONTDIR{ws}RB {yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);} FONTIVALUE return(FONTIVALUE); FONTFVALUE return(FONTFVALUE); @@ -415,7 +424,7 @@ scan_char(void) } static void -scan_string(char *attribute, unsigned keep, unsigned length) +scan_string(const char *attribute, unsigned keep, unsigned length) { register unsigned c, saved_ptr = 0, paren_level = 0; unsigned error_msg = FALSE; diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.c b/Build/source/texk/web2c/omegafonts/pl-parser.c index 0d33733c267..4f0dadc9259 100644 --- a/Build/source/texk/web2c/omegafonts/pl-parser.c +++ b/Build/source/texk/web2c/omegafonts/pl-parser.c @@ -70,7 +70,7 @@ /* Line 189 of yacc.c */ #line 1 "pl-parser.y" -/* pl.y: Grammar for reading property list files +/* pl-parser.y: Grammar for reading property list files This file is part of Omega, which is based on the web2c distribution of TeX, diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.y b/Build/source/texk/web2c/omegafonts/pl-parser.y index 2833db377cd..9011a50528a 100644 --- a/Build/source/texk/web2c/omegafonts/pl-parser.y +++ b/Build/source/texk/web2c/omegafonts/pl-parser.y @@ -1,5 +1,5 @@ %{ -/* pl.y: Grammar for reading property list files +/* pl-parser.y: Grammar for reading property list files This file is part of Omega, which is based on the web2c distribution of TeX, |