diff options
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatangle.web | 15 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.mk | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/web2c/makecpool.c | 155 |
4 files changed, 98 insertions, 81 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index f9939b96adf..59d69403a09 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2008-05-20 Karl Berry <karl@tug.org> + + (Found by peb.) + * luatexdir/luatangle.web: OTANGLE -> LUATANGLE. + * luatexdir/Makefile.in (check): PETEX -> LTEX. + * web2c/makecpool.c: update from luatex repo; cosmetic changes only. + 2008-04-29 Karl Berry <karl@tug.org> * doc/Makefile.in (install-data): do not cd $(srcdir) in any rule, diff --git a/Build/source/texk/web2c/luatexdir/luatangle.web b/Build/source/texk/web2c/luatexdir/luatangle.web index 0cc3e8416c6..46ca98e1e14 100644 --- a/Build/source/texk/web2c/luatexdir/luatangle.web +++ b/Build/source/texk/web2c/luatexdir/luatangle.web @@ -1,9 +1,10 @@ -% otangle.web: Omega version of file tangle.web +% luatangle.web: LuaTeX version of file tangle.web +% $Id$ % -% This file is part of the Omega project, which -% is based in the web2c distribution of TeX. +% This file is part of LuaTeX. % % Copyright (c) 1994--1998 John Plaice and Yannis Haralambous +% Copyright 2006-2008 Taco Hoekwater <taco@luatex.org> % applies only to the changes to the original tangle.web. % % This program by D. E. Knuth is not copyrighted and can be used freely. @@ -37,12 +38,12 @@ \mathchardef\BA="3224 % double arrow \def\({} % kludge for alphabetizing certain module names -\def\title{OTANGLE} +\def\title{LUATANGLE} \def\contentspagenumber{123} % should be odd \def\topofcontents{\null\vfill \titlefalse % include headline on the contents page \def\rheader{\mainfont Appendix E\hfil \contentspagenumber} - \centerline{\titlefont The {\ttitlefont OTANGLE} processor} + \centerline{\titlefont The {\ttitlefont LUATANGLE} processor} \vskip 15pt \centerline{(Version 4.4)} \vfill} @@ -73,7 +74,7 @@ dependencies' in the index below. The ``banner line'' defined here should be changed whenever \.{TANGLE} is modified. -@d banner=='This is OTANGLE, Version 4.4' +@d banner=='This is LUATANGLE, Version 4.4' @ The program begins with a fairly normal header, made up of pieces that @^system dependencies@> @@ -87,7 +88,7 @@ calls the `|jump_out|' procedure, which goes to the label |end_of_TANGLE|. @d end_of_TANGLE = 9999 {go here to wrap it up} @p @t\4@>@<Compiler directives@>@/ -program OTANGLE(@!web_file,@!change_file,@!Pascal_file,@!pool); +program LUATANGLE(@!web_file,@!change_file,@!Pascal_file,@!pool); label end_of_TANGLE; {go here to finish} const @<Constants in the outer block@>@/ type @<Types in the outer block@>@/ diff --git a/Build/source/texk/web2c/luatexdir/luatex.mk b/Build/source/texk/web2c/luatexdir/luatex.mk index 02fc2bae055..86c593f6185 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.mk +++ b/Build/source/texk/web2c/luatexdir/luatex.mk @@ -91,7 +91,7 @@ luatex.p luatex.pool: luatangle $(srcdir)/$(luatexdir)/luatex.web $(srcdir)/$(lu #luatex-all.pdf: luatex-all.tex # $(luatex) luatex-all.tex -check: @PETEX@ luatex-check +check: @LTEX@ luatex-check luatex-check: luatex luatex.fmt clean:: luatex-clean diff --git a/Build/source/texk/web2c/web2c/makecpool.c b/Build/source/texk/web2c/web2c/makecpool.c index 7e2eca3315c..7f4ebebb0ed 100644 --- a/Build/source/texk/web2c/web2c/makecpool.c +++ b/Build/source/texk/web2c/web2c/makecpool.c @@ -5,80 +5,89 @@ #include <string.h> #include <stdlib.h> -int main(int argc, char *argv[]) { - char *filename; - char *headername; - FILE *fh; - char data[1024]; - int is_metafont = 0; - int is_metapost = 0; - int is_luatex = 0; - if (argc!=3) { - fprintf(stderr,"%s: need exactly two arguments (pool name and C header name).\n", argv[0]); - exit(EXIT_FAILURE); - } - filename = argv[1]; - headername = argv[2]; - fh = fopen(filename,"r"); - if (!fh) { - fprintf(stderr,"%s: can't open %s for reading.\n", argv[0], filename); - exit(EXIT_FAILURE); - } - if (strstr(filename,"luatex.pool")!=NULL) - is_luatex = 1; - else if (strstr(filename,"mp.pool")!=NULL) - is_metapost = 1; - else if (strstr(filename,"mf.pool")!=NULL) - is_metafont = 1; - printf( - "/*\n" - " * This file is auto-generated by makecpool.\n" - " * %s %s %s\n" - " */\n" - "\n" - "#include <stdio.h>\n" - "#include <string.h>\n" - "#include \"%s\"\n" - "\n" - "static const char *poolfilearr[] = {\n", argv[0], filename, headername, headername); - while (fgets(data,1024,fh)) { - int i; - int len = strlen(data); - int o = 0; /* skip first bytes */ - if (data[len-1]=='\n') { - data[len-1] = 0; - len--; +static const char __svn_version[] = + "$Id: makecpool.c 1230 2008-05-03 11:11:32Z oneiros $ $URL: svn://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/makecpool.c $"; + +int main(int argc, char *argv[]) +{ + char *filename; + char *headername; + FILE *fh; + char data[1024]; + int is_metafont = 0; + int is_metapost = 0; + int is_luatex = 0; + if (argc != 3) { + fprintf(stderr, + "%s: need exactly two arguments (pool name and C header name).\n", + argv[0]); + exit(EXIT_FAILURE); } - if (data[0]=='*') break; - if (data[0]>='0' && data[0]<='9' && data[1]>='0' && data[1]<='9') { - o=2; + filename = argv[1]; + headername = argv[2]; + fh = fopen(filename, "r"); + if (!fh) { + fprintf(stderr, "%s: can't open %s for reading.\n", argv[0], filename); + exit(EXIT_FAILURE); } - printf(" \""); - for (i=o; i<len; i++) { - if (data[i]=='"' || data[i]=='\\') putchar('\\'); - if (data[i]=='?') printf("\" \""); /* suppress trigraphs */ - putchar(data[i]); + if (strstr(filename, "luatex.pool") != NULL) + is_luatex = 1; + else if (strstr(filename, "mp.pool") != NULL) + is_metapost = 1; + else if (strstr(filename, "mf.pool") != NULL) + is_metafont = 1; + printf("/*\n" + " * This file is auto-generated by makecpool.\n" + " * %s %s %s\n" + " */\n" + "\n" + "#include <stdio.h>\n" + "#include <string.h>\n" + "#include \"%s\"\n" + "\n" + "static const char *poolfilearr[] = {\n", argv[0], filename, + headername, headername); + while (fgets(data, 1024, fh)) { + int i; + int len = strlen(data); + int o = 0; /* skip first bytes */ + if (data[len - 1] == '\n') { + data[len - 1] = 0; + len--; + } + if (data[0] == '*') + break; + if (data[0] >= '0' && data[0] <= '9' && data[1] >= '0' + && data[1] <= '9') { + o = 2; + } + printf(" \""); + for (i = o; i < len; i++) { + if (data[i] == '"' || data[i] == '\\') + putchar('\\'); + if (data[i] == '?') + printf("\" \""); /* suppress trigraphs */ + putchar(data[i]); + } + printf("\",\n"); } - printf("\",\n"); - } - fclose(fh); - printf(" NULL };\n" - "int loadpoolstrings (integer spare_size) {\n" - " const char *s;\n" - " strnumber g=0;\n" - " int i=0,j=0;\n" - " while ((s = poolfilearr[j++])) {\n" - " int l = strlen (s);\n" - " i += l;\n" - " if (i>=spare_size) return 0;\n"); - if (is_luatex) - printf(" while (l-- > 0) str_pool[pool_ptr++] = *s++;\n" - " g = make_string();\n"); - else - printf(" while (l-- > 0) strpool[poolptr++] = *s++;\n" - " g = makestring();\n"); - if (is_metapost || is_metafont) - printf(" strref[g]= 127;\n"); - printf(" }\n" " return g;\n" "}\n"); - return EXIT_SUCCESS; + fclose(fh); + printf(" NULL };\n" + "int loadpoolstrings (integer spare_size) {\n" + " const char *s;\n" + " strnumber g=0;\n" + " int i=0,j=0;\n" + " while ((s = poolfilearr[j++])) {\n" + " int l = strlen (s);\n" + " i += l;\n" " if (i>=spare_size) return 0;\n"); + if (is_luatex) + printf(" while (l-- > 0) str_pool[pool_ptr++] = *s++;\n" + " g = make_string();\n"); + else + printf(" while (l-- > 0) strpool[poolptr++] = *s++;\n" + " g = makestring();\n"); + if (is_metapost || is_metafont) + printf(" strref[g]= 127;\n"); + printf(" }\n" " return g;\n" "}\n"); + return EXIT_SUCCESS; } |