upTeX u1.11 from TANAKA Takuji

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

7 files changed, 26 insertions, 13 deletions

diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 8ff03c62795..74e4bdead61 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13  TANAKA Takuji <KXD02663@nifty.ne.jp>
+
+	* uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch,
+	uptex_version.h: upTeX version u1.11.
+
 2012-08-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/uptex.am: Clarify *tex_version.h dependencies.
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index 737c8e74005..75649d02b65 100644
--- a/Build/source/texk/web2c/uptexdir/upbibtex.ch
+++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch
@@ -3,7 +3,7 @@
 @d banner=='This is pBibTeX, Version 0.99d-j0.33'
 @y
 @d my_name=='upbibtex'
-@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.10'
+@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.11'
 @z
 
 @x
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index b5cb829940d..5f58107a935 100644
--- a/Build/source/texk/web2c/uptexdir/updvitype.ch
+++ b/Build/source/texk/web2c/uptexdir/updvitype.ch
@@ -3,7 +3,7 @@
 @d banner=='This is pDVItype, Version 3.6-p0.4'
 @y
 @d my_name=='updvitype'
-@d banner=='This is upDVItype, Version 3.6-p0.4-u1.10'
+@d banner=='This is upDVItype, Version 3.6-p0.4-u1.11'
 @z
 
 @x procedure initialize
diff --git a/Build/source/texk/web2c/uptexdir/uppltotf.ch b/Build/source/texk/web2c/uptexdir/uppltotf.ch
index 77fd8e3d118..a5df99d4e3a 100644
--- a/Build/source/texk/web2c/uptexdir/uppltotf.ch
+++ b/Build/source/texk/web2c/uptexdir/uppltotf.ch
@@ -3,7 +3,7 @@
 @d banner=='This is pPLtoTF, Version 3.5-p1.8'
 @y
 @d my_name=='uppltotf'
-@d banner=='This is upPLtoTF, Version 3.5-p1.8-u1.10'
+@d banner=='This is upPLtoTF, Version 3.5-p1.8-u1.11'
 @z
 
 @x
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index 6fbe1ac7e6e..b9c8bc31165 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -1,4 +1,4 @@
-% This is a change file for upTeX u1.10
+% This is a change file for upTeX u1.11
 % By Takuji Tanaka.
 %
 % (02/26/2007) TTK  upTeX u0.01
@@ -31,13 +31,14 @@
 % (04/10/2010) TTK  upTeX u0.30
 % (01/15/2012) TTK  upTeX u1.00
 % (04/29/2012) TTK  upTeX u1.10
+% (08/13/2012) TTK  upTeX u1.11
 
 @x upTeX: banner
   {printed when p\TeX\ starts}
 @y
   {printed when p\TeX\ starts}
 @#
-@d upTeX_version_string=='-u1.10' {current up\TeX\ version}
+@d upTeX_version_string=='-u1.11' {current up\TeX\ version}
 @#
 @d upTeX_version==pTeX_version_string,upTeX_version_string
 @d upTeX_banner=='This is upTeX, Version 3.1415926',upTeX_version
@@ -258,14 +259,10 @@ primitive("kchar",kchar_num,0);@/
 @z
 
 @x
-char_num: print_esc("char");
-cs_name: print_esc("csname");
-def_font: print_esc("font");
+ital_corr: print_esc("/");
 @y
-char_num: print_esc("char");
+ital_corr: print_esc("/");
 kchar_num: print_esc("kchar");
-cs_name: print_esc("csname");
-def_font: print_esc("font");
 @z
 
 @x
@@ -949,6 +946,17 @@ primitive("kchardef",shorthand_def,kchar_def_code);@/
 @!@:kchar_def_}{\.{\\kchardef} primitive@>
 @z
 
+@x
+shorthand_def: case chr_code of
+  char_def_code: print_esc("chardef");
+  math_char_def_code: print_esc("mathchardef");
+@y
+shorthand_def: case chr_code of
+  char_def_code: print_esc("chardef");
+  kchar_def_code: print_esc("kchardef");
+  math_char_def_code: print_esc("mathchardef");
+@z
+
 @x l.23698 - upTeX
 char_given: begin print_esc("char"); print_hex(chr_code);
   end;
diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h
index 3befc4d32dd..88f38325d9d 100644
--- a/Build/source/texk/web2c/uptexdir/uptex_version.h
+++ b/Build/source/texk/web2c/uptexdir/uptex_version.h
@@ -1 +1 @@
-#define UPTEX_VERSION "u1.10"
+#define UPTEX_VERSION "u1.11"
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index 5a57f416d8a..5b71a7edc64 100644
--- a/Build/source/texk/web2c/uptexdir/uptftopl.ch
+++ b/Build/source/texk/web2c/uptexdir/uptftopl.ch
@@ -3,7 +3,7 @@
 @d banner=='This is pTFtoPL, Version 3.2-p1.7'
 @y
 @d my_name=='uptftopl'
-@d banner=='This is upTFtoPL, Version 3.2-p1.7-u1.10'
+@d banner=='This is upTFtoPL, Version 3.2-p1.7-u1.11'
 @z
 
 @x