e-(u)pTeX: Remove interference between fam256.ch and uptex-m.ch

git-svn-id: svn://tug.org/texlive/trunk@27383 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 9 insertions, 22 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 6c46a4f20a0..21566dabb53 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2085,9 +2085,7 @@ euptex_ch_srcs = \
 	euptexdir/euptex.ch1 \
 	eptexdir/etex.ch1 \
 	$(euptex_ch_synctex) \
-	euptexdir/fam256-eup-pre.ch \
 	eptexdir/fam256.ch \
-	euptexdir/fam256-eup-post.ch \
 	euptexdir/pdfstrcmp-eup-pre.ch \
 	eptexdir/pdfstrcmp.ch \
 	euptexdir/pdfstrcmp-eup-post.ch \
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 82a21cc0b1e..48516016e93 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* fam256.ch: Slightly reduce one changeset to simplify e-upTeX.
+
 2012-08-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* eptex.ech, eptrip/etrip.tex: Adapt to e-TeX Version 2.5.
diff --git a/Build/source/texk/web2c/eptexdir/fam256.ch b/Build/source/texk/web2c/eptexdir/fam256.ch
index e796207c686..d219e6228d1 100644
--- a/Build/source/texk/web2c/eptexdir/fam256.ch
+++ b/Build/source/texk/web2c/eptexdir/fam256.ch
@@ -1092,10 +1092,8 @@ primitive("omathchardef",shorthand_def,omath_char_def_code);@/
 @z
 %-----------------------------------------------
 @x
-  char_def_code: print_esc("chardef");
   math_char_def_code: print_esc("mathchardef");
 @y
-  char_def_code: print_esc("chardef");
   math_char_def_code: print_esc("mathchardef");
   omath_char_def_code: print_esc("omathchardef");
 @z
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 62783aab2f3..09c3d30b2fd 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* fam256-eup-pre.ch, fam256-eup-post.ch (removed): Now obsolete.
+	* am/euptex.am: Drop fam256-eup-pre.ch and fam256-eup-post.ch.
+
 2012-08-13  TANAKA Takuji <KXD02663@nifty.ne.jp>
 
 	* am/euptex.am: Use the new fam256-eup-pre.ch and fam256-eup-post.ch
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 1d7d2413e15..08a929d175c 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -68,9 +68,7 @@ euptex_ch_srcs = \
 	euptexdir/euptex.ch1 \
 	eptexdir/etex.ch1 \
 	$(euptex_ch_synctex) \
-	euptexdir/fam256-eup-pre.ch \
 	eptexdir/fam256.ch \
-	euptexdir/fam256-eup-post.ch \
 	euptexdir/pdfstrcmp-eup-pre.ch \
 	eptexdir/pdfstrcmp.ch \
 	euptexdir/pdfstrcmp-eup-post.ch \
diff --git a/Build/source/texk/web2c/euptexdir/fam256-eup-post.ch b/Build/source/texk/web2c/euptexdir/fam256-eup-post.ch
deleted file mode 100644
index 4160bc9c1bc..00000000000
--- a/Build/source/texk/web2c/euptexdir/fam256-eup-post.ch
+++ /dev/null
@@ -1,8 +0,0 @@
-@x
-  char_def_code: print_esc("chardef");
-  math_char_def_code: print_esc("mathchardef");
-@y
-  char_def_code: print_esc("chardef");
-  kchar_def_code: print_esc("kchardef");
-  math_char_def_code: print_esc("mathchardef");
-@z
diff --git a/Build/source/texk/web2c/euptexdir/fam256-eup-pre.ch b/Build/source/texk/web2c/euptexdir/fam256-eup-pre.ch
deleted file mode 100644
index 548b5f624c1..00000000000
--- a/Build/source/texk/web2c/euptexdir/fam256-eup-pre.ch
+++ /dev/null
@@ -1,8 +0,0 @@
-@x
-  char_def_code: print_esc("chardef");
-  kchar_def_code: print_esc("kchardef");
-  math_char_def_code: print_esc("mathchardef");
-@y
-  char_def_code: print_esc("chardef");
-  math_char_def_code: print_esc("mathchardef");
-@z