diff options
Diffstat (limited to 'Build/source/texk/web2c/eptexdir')
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/ChangeLog.TL | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/am/eptex.am | 16 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/eptex.ech | 18 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/eptexextra.h | 3 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/etex.ch1 | 12 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/fam256.ch | 3 | ||||
| -rw-r--r-- | Build/source/texk/web2c/eptexdir/pdfsavepos.ch | 6 |
7 files changed, 37 insertions, 27 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL index 4ad7523d8ee..86e7309f0ec 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL +++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL @@ -1,6 +1,12 @@ ChangeLog.TL: TeX Live (TL) changes for e-pTeX ============================================== +2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptex.ech, eptexextra.h, etex.ch1, am/eptex.am, fam256.ch: + Slightly reformulate to simplify e-upTeX. + * pdfsavepos.ch: \pdfsavepos is extension, not convert case. + 2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> * eptex.defines: Add newline at end of file. diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index 96dbd00955e..da582985d1c 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -23,11 +23,11 @@ eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs) # e-pTeX C sources eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h -nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/ptex_version.h +nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h # We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS. -eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/ptex_version.h +eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h $(eptex_OBJECTS): $(eptex_prereq) $(eptex_c_h): eptex-web2c @@ -50,10 +50,16 @@ eptexdir/etex_version.h: etexdir/etex.ch grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@ -# Extract ptex version -eptexdir/ptex_version.h: eptexdir/eptex.ech +# Extract eptex version +eptexdir/eptex_version.h: eptexdir/eptex.ech $(MKDIR_P) eptexdir - grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ + grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \ + | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@ + +# Extract ptex version +eptexdir/ptex_version.h: ptexdir/ptex-base.ch + $(MKDIR_P) ptexdir + grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@ # Generate eptex.web diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index e11b01f2e42..30d687672be 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -8,10 +8,12 @@ \def\epTeX{$\varepsilon$-p\TeX} @z -@x [1.2] l.200 - pTeX: -@d pTeX_version_string=='-p3.2' {current p\TeX\ version} +@x [1.2] l.190 - epTeX: +@d eTeX_version_string=='-2.3' {current \eTeX\ version} @y -@d pTeX_version_string=='-p3.2-110415' {current \epTeX\ version} +@d eTeX_version_string=='-2.3' {current \eTeX\ version} +@# +@d epTeX_version_string=='-110415' @z @x e-pTeX: banner @@ -19,12 +21,20 @@ @y {printed when p\TeX\ starts} @# -@d epTeX_version==pTeX_version_string,eTeX_version_string +@d epTeX_version==pTeX_version_string,epTeX_version_string,eTeX_version_string @d epTeX_banner=='This is e-pTeX, Version 3.1415926',epTeX_version @d epTeX_banner_k==epTeX_banner {printed when \epTeX\ starts} @z +@x [1.2] +@d banner==pTeX_banner +@d banner_k==pTeX_banner_k +@y +@d banner==epTeX_banner +@d banner_k==epTeX_banner_k +@z + @x @d max_quarterword=255 {largest allowable value in a |quarterword|} @y diff --git a/Build/source/texk/web2c/eptexdir/eptexextra.h b/Build/source/texk/web2c/eptexdir/eptexextra.h index f9cf9747695..e232e433d57 100644 --- a/Build/source/texk/web2c/eptexdir/eptexextra.h +++ b/Build/source/texk/web2c/eptexdir/eptexextra.h @@ -4,9 +4,10 @@ */ #include <eptexdir/etex_version.h> /* for ETEX_VERSION */ +#include <eptexdir/eptex_version.h> /* for EPTEX_VERSION */ #include <eptexdir/ptex_version.h> /* for PTEX_VERSION */ -#define BANNER "This is e-pTeX, Version 3.1415926-" PTEX_VERSION "-" ETEX_VERSION +#define BANNER "This is e-pTeX, Version 3.1415926-" PTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION #define COPYRIGHT_HOLDER "D.E. Knuth" #define AUTHOR NULL #define PROGRAM_HELP EPTEXHELP diff --git a/Build/source/texk/web2c/eptexdir/etex.ch1 b/Build/source/texk/web2c/eptexdir/etex.ch1 index 0032ec606e5..1f5fac7bb73 100644 --- a/Build/source/texk/web2c/eptexdir/etex.ch1 +++ b/Build/source/texk/web2c/eptexdir/etex.ch1 @@ -1,14 +1,6 @@ % eptexdir/etex.ch1: changefile used to build e-pTeX, see eptexdir/eptex-base.ch for details. % Public domain. Originally written by Peter Breitenlohner <tex-live@tug.org>. -@x [1.2] -@d banner==pTeX_banner -@d banner_k==pTeX_banner_k -@y -@d banner==epTeX_banner -@d banner_k==epTeX_banner_k -@z - @x [12.184] begin print(", "); print_direction(box_dir(p)); @y @@ -25,9 +17,9 @@ @z @x [27.468] -@d job_name_code=10 {command code for \.{\\jobname}} +@d job_name_code=ptex_convert_codes {command code for \.{\\jobname}} @y -@d etex_convert_base=10 {base for \eTeX's command codes} +@d etex_convert_base=ptex_convert_codes {base for \eTeX's command codes} @d eTeX_revision_code=etex_convert_base {command code for \.{\\eTeXrevision}} @d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes} @d job_name_code=etex_convert_codes {command code for \.{\\jobname}} diff --git a/Build/source/texk/web2c/eptexdir/fam256.ch b/Build/source/texk/web2c/eptexdir/fam256.ch index dc759b93812..829ee8113c5 100644 --- a/Build/source/texk/web2c/eptexdir/fam256.ch +++ b/Build/source/texk/web2c/eptexdir/fam256.ch @@ -260,7 +260,8 @@ end; @x char_given,math_given: scanned_result(cur_chr)(int_val); @y -char_given,math_given,omath_given: scanned_result(cur_chr)(int_val); +omath_given, +char_given,math_given: scanned_result(cur_chr)(int_val); @z %----------------------------------------------- @x diff --git a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch index 3c5b58f822b..077b3b384c0 100644 --- a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch +++ b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch @@ -39,12 +39,6 @@ pdf_page_height_code: print_esc("pdfpageheight"); @z @x -@d etex_convert_codes=etex_convert_base+2 {end of \eTeX's command codes} -@y -@d etex_convert_codes=etex_convert_base+3 {end of \eTeX's command codes} -@z - -@x @ @<Initialize variables as |ship_out| begins@>= @y @ @<Initialize variables as |ship_out| begins@>= |