summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-14 12:42:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-14 12:42:08 +0000
commit374ad175fd3308fe6510a6337a438c2df068b782 (patch)
tree03aee07797daa90c4251afed78a65cab0fe05eab
parent06939aad980a794e6a68dbc930a3b6f96115dbb2 (diff)
Mention \protected in eTeX/pdfTeX/XeTeX/Aleph/e-pTeX
error and help messages only when in extended mode git-svn-id: svn://tug.org/texlive/trunk@21071 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/alephdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/alephdir/eobase.ch15
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip.diffsbin28735 -> 28591 bytes
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/etexdir/etex.ch15
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.diffs44
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.tex2
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web15
9 files changed, 74 insertions, 35 deletions
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 5eaffcb29cd..077b12c4ee2 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eobase.ch: Adapt to ../etexdir/etex.ch:
+ Mention \protected in error and help messages only when in
+ in extended mode.
+
2011-01-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* aleph.mk (removed): Obsolete.
diff --git a/Build/source/texk/web2c/alephdir/eobase.ch b/Build/source/texk/web2c/alephdir/eobase.ch
index f4d3494938a..35a2e3bf4b4 100644
--- a/Build/source/texk/web2c/alephdir/eobase.ch
+++ b/Build/source/texk/web2c/alephdir/eobase.ch
@@ -2729,7 +2729,9 @@ or `\.{\\outer}', and it might or might not be expanded. The prefixes
@x [49] m.1212 l.22730 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer or \global.");
@y
-help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
+help1("I'll pretend you didn't say \long or \outer or \global.");
+if eTeX_ex then help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \global or \protected.";
@z
%---------------------------------------
@x [49] m.1213 l.22686 - e-TeX protected
@@ -2743,14 +2745,19 @@ if a>=8 then
else j:=0;
if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
begin print_err("You can't use `"); print_esc("long"); print("' or `");
- print_esc("outer"); print("' or `");
- print_esc("protected"); print("' with `");
+ print_esc("outer");
+ help1("I'll pretend you didn't say \long or \outer here.");
+ if eTeX_ex then
+ begin help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \protected here.";
+ print("' or `"); print_esc("protected");
+ end;
+ print("' with `");
@z
%---------------------------------------
@x [49] m.1213 l.22691 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer here.");
@y
- help1("I'll pretend you didn't say \long or \outer or \protected here.");
@z
%---------------------------------------
@x [49] m.1218 l.22749 - e-TeX protected
diff --git a/Build/source/texk/web2c/eptexdir/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip.diffs
index da3a0223b27..63b01ff8062 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip.diffs
+++ b/Build/source/texk/web2c/eptexdir/eptrip.diffs
Binary files differ
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index c0115c51015..d194cfd5949 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex.ch: Mention \protected in error and help messages only
+ when in extended mode.
+ * etrip/etrip.tex: Fixed a typo currentgroup{type => level}.
+
2011-01-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* etex.mak, etex.mk (removed): Obsolete.
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 119dbf3b6b2..72d409b5c78 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -2652,7 +2652,9 @@ or `\.{\\outer}', and it might or might not be expanded. The prefixes
@x [49] m.1212 l.22730 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer or \global.");
@y
-help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
+help1("I'll pretend you didn't say \long or \outer or \global.");
+if eTeX_ex then help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \global or \protected.";
@z
%---------------------------------------
@x [49] m.1213 l.22735 - e-TeX protected
@@ -2666,14 +2668,19 @@ if a>=8 then
else j:=0;
if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
begin print_err("You can't use `"); print_esc("long"); print("' or `");
- print_esc("outer"); print("' or `");
- print_esc("protected"); print("' with `");
+ print_esc("outer");
+ help1("I'll pretend you didn't say \long or \outer here.");
+ if eTeX_ex then
+ begin help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \protected here.";
+ print("' or `"); print_esc("protected");
+ end;
+ print("' with `");
@z
%---------------------------------------
@x [49] m.1213 l.22740 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer here.");
@y
- help1("I'll pretend you didn't say \long or \outer or \protected here.");
@z
%---------------------------------------
@x [49] m.1218 l.22798 - e-TeX protected
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
index 904c2db1306..4048641dd43 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
@@ -12,7 +12,7 @@
1c1
< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (INITEX) 18 MAY 2010 13:31
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP) (INITEX) 14 JAN 2011 11:24
3c3
< (trip.tex
---
@@ -23,8 +23,8 @@
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2010.5.18)
-> 1486 strings of total length 26070
+> (format=trip 2011.1.14)
+> 1488 strings of total length 26174
> 479 memory locations dumped; current usage is 104&278
> 342 multiletter control sequences
461c461
@@ -39,7 +39,7 @@
< ** &trip trip
< (trip.tex ##
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest)
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP)
> **(./trip.tex ##
17c16
< Memory usage before: 159&313; after: 102&278; still untouched: 1613
@@ -53,7 +53,7 @@
1c1
< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (format=trip 2010.5.18) 18 MAY 2010 13:31
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP) (format=trip 2011.1.14) 14 JAN 2011 11:24
3c3
< (trip.tex ##
---
@@ -151,10 +151,6 @@
< Memory usage before: 776&458; after: 464&452; still untouched: 175
---
> Memory usage before: 1098&458; after: 630&452; still untouched: 178
-4845c4849
-< I'll pretend you didn't say \long or \outer or \global.
----
-> I'll pretend you didn't say \long or \outer or \global or \protected.
6380c6384
< (tripos.tex
---
@@ -177,8 +173,8 @@
< 2825 words of memory out of 3000
< 372 multiletter control sequences out of 2100
---
-> 44 strings out of 1814
-> 261 string characters out of 7930
+> 44 strings out of 1812
+> 261 string characters out of 7826
> 3821 words of memory out of 3999
> 373 multiletter control sequences out of 15000+0
7301c7305
@@ -191,11 +187,11 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
+> This is DVItype, Version 3.6 (TeX Live 2011/dev/MPP)
9c9
< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2010.05.18:1331'
+> ' TeX output 2011.01.14:1124'
419c419
< 1121: down4 639342208
---
@@ -313,6 +309,10 @@
< .\hbox(0.0+0.0)x-7127.0, shifted 7227.0
---
> .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display
+4849c4842
+< I'll pretend you didn't say \long or \outer or \global.
+---
+> I'll pretend you didn't say \long or \outer or \global or \protected.
7295a7289,7291
>
> ### semi simple group (level 1) entered at line 429 (begingroup)
@@ -340,7 +340,7 @@
1c1
< This is e-TeX, Version 3.141592-2.2 (INITEX) 6 SEP 2004 23:13
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (INITEX) 18 MAY 2010 13:31
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP) (INITEX) 14 JAN 2011 11:24
4c4,5
< (etrip.tex This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
---
@@ -350,8 +350,8 @@
< (preloaded format=etrip 2004.9.6)
< 1435 strings of total length 24590
---
-> (format=etrip 2010.5.18)
-> 1487 strings of total length 26101
+> (format=etrip 2011.1.14)
+> 1489 strings of total length 26205
28c29
< 407 multiletter control sequences
---
@@ -368,7 +368,7 @@
< entering extended mode
< (etrip.tex e-IniTeX: e-Trip format loaded.
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest)
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP)
> **entering extended mode
> (./etrip.tex e-IniTeX: e-Trip format loaded.
45a45,46
@@ -378,7 +378,7 @@
1c1
< This is e-TeX, Version 3.141592-2.2 (preloaded format=etrip 2004.9.6) 6 SEP 2004 23:13
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (format=etrip 2010.5.18) 18 MAY 2010 13:31
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP) (format=etrip 2011.1.14) 14 JAN 2011 11:24
4c4
< (etrip.tex e-IniTeX: e-Trip format loaded.
---
@@ -409,8 +409,8 @@
< 2661 words of memory out of 3000
< 408 multiletter control sequences out of 2100
---
-> 18 strings out of 1813
-> 140 string characters out of 7899
+> 18 strings out of 1811
+> 140 string characters out of 7795
> 3161 words of memory out of 3999
> 409 multiletter control sequences out of 15000+0
4278c4280
@@ -423,10 +423,10 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
+> This is DVItype, Version 3.6 (TeX Live 2011/dev/MPP)
9c9
< ' TeX output 2004.09.06:2313'
---
-> ' TeX output 2010.05.18:1331'
+> ' TeX output 2011.01.14:1124'
+ :
PASS: etexdir/etrip.test
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
index ab3468d5cd8..dd9459d7fe2 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
@@ -279,7 +279,7 @@
\typeout{Checking \string\currentgrouptype,
\string\currentgrouplevel, and \string\lastnodetype:}
\typeout{current group level (l.\number\inputlineno):
- \ifcase\currentgrouptype outer level\else BAD!\fi}
+ \ifcase\currentgrouplevel outer level\else BAD!\fi}
\typeout{current group type (l.\number\inputlineno):
\ifcase\currentgrouptype bottom level\else BAD!\fi}
\begingroup
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 5b771e90f2e..272ee929f6c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftex.web: Adapt to ../etexdir/etex.ch:
+ Mention \protected in error and help messages only when in
+ in extended mode.
+
2011-01-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdftex.mak, pdftex.mk (removed): Obsolete.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 8a8ac8d6ed2..d96a1ff0750 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -31115,7 +31115,9 @@ exit:end;
begin print_err("You can't use a prefix with `");
@.You can't use a prefix with x@>
print_cmd_chr(cur_cmd,cur_chr); print_char("'");
-help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
+help1("I'll pretend you didn't say \long or \outer or \global.");
+if eTeX_ex then help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \global or \protected.";
back_error; return;
end
@@ -31126,11 +31128,16 @@ if a>=8 then
else j:=0;
if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
begin print_err("You can't use `"); print_esc("long"); print("' or `");
- print_esc("outer"); print("' or `");
- print_esc("protected"); print("' with `");
+ print_esc("outer");
+ help1("I'll pretend you didn't say \long or \outer here.");
+ if eTeX_ex then
+ begin help_line[0]:=@|
+ "I'll pretend you didn't say \long or \outer or \protected here.";
+ print("' or `"); print_esc("protected");
+ end;
+ print("' with `");
@.You can't use \\long...@>
print_cmd_chr(cur_cmd,cur_chr); print_char("'");
- help1("I'll pretend you didn't say \long or \outer or \protected here.");
error;
end