[latex3-commits] [l3svn] branch master updated: l3build: Wrap lines correctly for LuaTeX
noreply at latex-project.org
noreply at latex-project.org
Fri Jan 1 19:26:51 CET 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new efcb05f l3build: Wrap lines correctly for LuaTeX
efcb05f is described below
commit efcb05ff379a8c7dae860d69eeaaf21c90f87be8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jan 1 18:25:38 2016 +0000
l3build: Wrap lines correctly for LuaTeX
As well as addressing the immediate need to wrap lines, this
also picks up some bugs in the activations of formatlualog.
The LuaTeX tests are re-enabled.
---
build-config.lua | 2 +-
contrib/testfiles/ctex002.luatex.tlg | 9 ++-
contrib/testfiles/unicode-math001.luatex.tlg | 24 +++++---
l3build/l3build.lua | 28 ++++++---
.../l3sort/testfiles/m3sort001.luatex.tlg | 15 ++++-
.../l3str/testfiles/m3regex005.luatex.tlg | 14 ++---
.../l3str/testfiles/m3regex010.luatex.tlg | 4 +-
.../xcoffins/testfiles/xcoffins002.luatex.tlg | 4 +-
.../xcoffins/testfiles/xcoffins003.luatex.tlg | 8 +--
l3kernel/testfiles/d3dvips.luatex.tlg | 8 +--
l3kernel/testfiles/m3char001.luatex.tlg | 64 ++++++++++----------
l3kernel/testfiles/m3expl001.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl002.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl004.luatex.tlg | 2 +-
l3kernel/testfiles/m3expl006.luatex.tlg | 2 +-
l3kernel/testfiles/m3msg004.luatex.tlg | 6 +-
l3packages/xparse/testfiles/xparse002.luatex.tlg | 4 +-
l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg | 6 +-
l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg | 2 +-
l3trial/xbox/testfiles/xbox001.luatex.tlg | 6 +-
21 files changed, 123 insertions(+), 95 deletions(-)
diff --git a/build-config.lua b/build-config.lua
index d9b79d2..5cb0ca2 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -6,7 +6,7 @@ unpackdeps = unpackdeps or {maindir .. "/l3kernel"}
cmdchkfiles = cmdchkfiles or {"*.dtx"}
checkengines = checkengines
- or {"pdftex", "xetex", "ptex", "uptex"}
+ or {"pdftex", "xetex", "luatex", "ptex", "uptex"}
checksuppfiles = checksuppfiles or
{
"CaseFolding.txt",
diff --git a/contrib/testfiles/ctex002.luatex.tlg b/contrib/testfiles/ctex002.luatex.tlg
index 5ae0e4d..3cc5f73 100644
--- a/contrib/testfiles/ctex002.luatex.tlg
+++ b/contrib/testfiles/ctex002.luatex.tlg
@@ -16,9 +16,12 @@ Don't change this file in any respect.
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-LaTeX Font Info: Font shape `LTJY3/FandolSong-Regular(0)/m/sl' in size <10.53937> not available
-(Font) Font shape `LTJY3/FandolSong-Regular(0)/m/it' tried instead on input line ....
-luaotfload | load : path lookup of "FandolKai-Regular.otf" unsuccessful, falling back to file:
+LaTeX Font Info: Font shape `LTJY3/FandolSong-Regular(0)/m/sl' in size <10.53
+937> not available
+(Font) Font shape `LTJY3/FandolSong-Regular(0)/m/it' tried instead
+on input line ....
+luaotfload | load : path lookup of "FandolKai-Regular.otf" unsuccessful, falling
+ back to file:
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0, direction TLT
.\whatsit4=[]
diff --git a/contrib/testfiles/unicode-math001.luatex.tlg b/contrib/testfiles/unicode-math001.luatex.tlg
index 727e1b5..ea8896f 100644
--- a/contrib/testfiles/unicode-math001.luatex.tlg
+++ b/contrib/testfiles/unicode-math001.luatex.tlg
@@ -16,26 +16,34 @@ Don't change this file in any respect.
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
(Font) scaled to size 10.00015pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
(Font) scaled to size 7.01247pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
(Font) scaled to size 4.9808pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
(Font) scaled to size 9.99985pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
(Font) scaled to size 7.01224pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
LaTeX Font Info: Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
(Font) scaled to size 4.98067pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
+ to file:
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0, direction TLT
.\glue 16.0
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index af7433b..0b2737f 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -850,7 +850,7 @@ function formatlog(logfile, newfile, engine)
end
-- Additional normalization for LuaTeX
-function formatlualog(logfile, newfile)
+function formatlualog(logfile, newfile, engine)
local function normalize(line, lastline, dropping)
-- Find \discretionary or \whatsit lines:
-- These may come back later
@@ -982,14 +982,17 @@ function formatlualog(logfile, newfile)
return line, ""
end
end
- -- Wrap some cases that can be picked out
- -- In some places LuaTeX does use max_print_line, then we
- -- get into issues with different wrapping approaches
+ -- Wrap some cases that can be picked out:
+ -- This deals with a few places that can be normalised plus
+ -- the 'out by one' issue that LuaTeX has for some cases
local kpse = require("kpse")
- kpse.set_program_name("luatex")
+ kpse.set_program_name(engine)
local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
if string.len(line) == maxprintline then
- return "", line
+ return "", lastline .. line
+ -- Cover the out-by-one issue with LuaTeX
+ elseif string.len(line) == maxprintline + 1 and engine == "luatex" then
+ return "", lastline .. line
elseif string.len(lastline) == maxprintline then
if string.match(line, "\\ETC%.%}$") then
-- If the line wrapped at \ETC we might have lost a space
@@ -1001,8 +1004,13 @@ function formatlualog(logfile, newfile)
else
return lastline .. os_newline .. line, ""
end
+ -- Return all of the text for a wrapped (multi)line
+ elseif string.len(lastline) > maxprintline then
+ return lastline .. line, ""
end
- return line, ""
+ -- LuaTeX adds difference leading spaces to lines:
+ -- if we get this far, they need to be tided up
+ return string.gsub(line, "^%s+", ""), ""
end
local newlog = ""
local lastline = ""
@@ -1095,15 +1103,15 @@ function runcheck(name, hide)
-- Do additional log formatting if the engine is LuaTeX, there is no
-- LuaTeX-specific .tlg file and the default engine is not LuaTeX
if enginename == "luatex"
- and tlgfile ~= name .. ".luatex" .. tlgext
+ and not string.match(tlgfile, "%.luatex" .. "%" .. tlgext .. "$")
and stdengine ~= "luatex"
and stdengine ~= "luajittex" then
local luatlgfile = testdir .. "/" .. name .. ".luatex" .. tlgext
if os_windows then
luatlgfile = unix_to_win(luatlgfile)
end
- formatlualog(tlgfile, luatlgfile)
- formatlualog(newfile, newfile)
+ formatlualog(tlgfile, luatlgfile, stdengine)
+ formatlualog(newfile, newfile, "luatex")
errlevel = os.execute(
os_diffexe .. " " .. luatlgfile .. " " .. newfile
.. " > " .. difffile
diff --git a/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg b/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg
index 0dc4c03..b0d458f 100644
--- a/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg
+++ b/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg
@@ -24,7 +24,11 @@ TEST 1: Sort tl
{a\par b}
{0}{0}{1}{2}{2}{3}{3}{4}{4}{6}{7}{8}{8}
8234610203748
-{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{1}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
+{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{1
+}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3}{
+3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}
+{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7
+}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
============================================================
============================================================
TEST 2: Sort clist
@@ -33,7 +37,10 @@ TEST 2: Sort clist
{a, }
02,--3,03,3,4,7,8,23,48,61
8,23,4,61,02,--3,03,7,3,48
-02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,48,61,61,61,61,61,61,61,61,61,61
+02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,0
+3,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,
+8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,48,
+61,61,61,61,61,61,61,61,61,61
============================================================
============================================================
TEST 3: Sort seq
@@ -41,7 +48,9 @@ TEST 3: Sort seq
|\s__seq |
\s__seq \__seq_item:n {a, }
|\s__seq |
-\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3}\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_item:n {48}\__seq_item:n {61}
+\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3}
+\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_item
+:n {48}\__seq_item:n {61}
============================================================
============================================================
TEST 4: sort too long
diff --git a/l3experimental/l3str/testfiles/m3regex005.luatex.tlg b/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
index 45b6a08..5bed59d 100644
--- a/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
+++ b/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
@@ -280,13 +280,13 @@ l. ... }
|...............................................
> Compiled regex {\c {a|b\K }}:
+-branch
-Match
-control sequence
-+-branch
-char code 97
-+-branch
-char code 98
-char code 75.
+ Match
+ control sequence
+ +-branch
+ char code 97
+ +-branch
+ char code 98
+ char code 75.
<recently read> }
l. ... }
{1} {a}
diff --git a/l3experimental/l3str/testfiles/m3regex010.luatex.tlg b/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
index 94ff33a..ad0a2c8 100644
--- a/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
+++ b/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
@@ -22,8 +22,8 @@ TEST 1: LuaTeX bug which leads to an l3regex bug
============================================================
> Compiled regex {\\^^A}:
+-branch
-char code 92
-char code 1.
+ char code 92
+ char code 1.
<recently read> }
l. ... }
============================================================
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
index 25e05b3..7fe1a14 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
.\pdfcolorstack 0 pop
! OK.
<argument> \SetHorizontalCoffin \aaa {A}\showbox \aaa
-\ShowCoffinStructure \aaa \SetVertic
+ \ShowCoffinStructure \aaa \SetVertic
l. ...}
Size of coffin \aaa:
> ht = 6.83331pt
@@ -82,7 +82,7 @@ l. ...}
..\glue(\rightskip) 0.0
! OK.
<argument> ... \SetVerticalCoffin \bbb {1cm}{A}\showbox \bbb
-\ShowCoffinStructure \bbb
+ \ShowCoffinStructure \bbb
l. ...}
Size of coffin \bbb:
> ht = 6.83331pt
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
index 04dce11..51db936 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
@@ -198,7 +198,7 @@ TEST 1: Test 1: rotation
..\mathoff
! OK.
<argument> \showbox \aaa
-x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
+ x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
l. ...}
> \box71=
\hbox(0.0+0.0)x0.0, direction TLT
@@ -389,7 +389,7 @@ l. ...}
.....\pdfrestore
! OK.
<argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa
-x\fbox {\usebox \aaa }\Rot...
+ x\fbox {\usebox \aaa }\Rot...
l. ...}
> \box71=
\hbox(0.0+0.0)x0.0, direction TLT
@@ -591,7 +591,7 @@ l. ...}
.....\pdfrestore
! OK.
<argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa
-x\fbox {\usebox \aaa }
+ x\fbox {\usebox \aaa }
l. ...}
============================================================
============================================================
@@ -892,7 +892,7 @@ TEST 2: Test 2: rotation+alignment
...\pdfcolorstack 0 pop
! OK.
<argument> ...s \aaa [b,l]\bbb [B,hc](30pt,0pt)\showbox \aaa
-x\fbox {\usebox \aaa }x
+ x\fbox {\usebox \aaa }x
l. ...}
============================================================
============================================================
diff --git a/l3kernel/testfiles/d3dvips.luatex.tlg b/l3kernel/testfiles/d3dvips.luatex.tlg
index a4b6062..55d0d47 100644
--- a/l3kernel/testfiles/d3dvips.luatex.tlg
+++ b/l3kernel/testfiles/d3dvips.luatex.tlg
@@ -206,7 +206,7 @@ l. ... }
..\hbox(6.94444+0.0)x50.02786, direction TLT
...\special{ps:gsave}
...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
...\hbox(6.94444+0.0)x50.02786, direction TLT
....\hbox(6.94444+0.0)x50.02786, direction TLT
.....\OT1/cmr/m/n/10 H
@@ -232,7 +232,7 @@ l. ... }
..\hbox(6.94444+0.0)x50.02786, direction TLT
...\special{ps:gsave}
...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
...\hbox(6.94444+0.0)x50.02786, direction TLT
....\hbox(6.94444+0.0)x50.02786, direction TLT
.....\OT1/cmr/m/n/10 H
@@ -336,7 +336,7 @@ l. ... }
..\hbox(40.2855+0.0)x40.2855, direction TLT
...\special{ps:gsave}
...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
...\hbox(40.2855+0.0)x40.2855, direction TLT
....\hbox(40.2855+0.0)x40.2855, direction TLT
.....\hbox(40.2855+0.0)x40.2855, direction TLT
@@ -448,7 +448,7 @@ l. ... }
..\hbox(2.31477+0.0)x50.02786, direction TLT
...\special{ps:gsave}
...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
-e\ETC.}
+ e\ETC.}
...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
....\hbox(6.94444+0.0)x50.02786, direction TLT
.....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/m3char001.luatex.tlg b/l3kernel/testfiles/m3char001.luatex.tlg
index 7182c1c..96707b9 100644
--- a/l3kernel/testfiles/m3char001.luatex.tlg
+++ b/l3kernel/testfiles/m3char001.luatex.tlg
@@ -50,11 +50,11 @@ l. ... }
> the letter P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> the letter ^^?.
-\l_tmpa_tl ->^^?
+> the letter .
+\l_tmpa_tl ->
l. ... }
> \l_tmpa_tl=^^@.
<recently read> }
@@ -86,11 +86,11 @@ l. ... }
> the character P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> the character ^^?.
-\l_tmpa_tl ->^^?
+> the character .
+\l_tmpa_tl ->
l. ... }
============================================================
============================================================
@@ -126,11 +126,11 @@ l. ... }
> math shift character P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> math shift character ^^?.
-\l_tmpa_tl ->^^?
+> math shift character .
+\l_tmpa_tl ->
l. ... }
> \l_tmpa_tl=^^@.
<recently read> }
@@ -162,11 +162,11 @@ l. ... }
> alignment tab character P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> alignment tab character ^^?.
-\l_tmpa_tl ->^^?
+> alignment tab character .
+\l_tmpa_tl ->
l. ... }
> \l_tmpa_tl=^^@.
<recently read> }
@@ -198,11 +198,11 @@ l. ... }
> superscript character P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> superscript character ^^?.
-\l_tmpa_tl ->^^?
+> superscript character .
+\l_tmpa_tl ->
l. ... }
> \l_tmpa_tl=^^@.
<recently read> }
@@ -234,11 +234,11 @@ l. ... }
> subscript character P.
\l_tmpa_tl ->P
l. ... }
-> \l_tmpa_tl=^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
-> subscript character ^^?.
-\l_tmpa_tl ->^^?
+> subscript character .
+\l_tmpa_tl ->
l. ... }
============================================================
============================================================
@@ -259,7 +259,7 @@ l. ... }
> \l_tmpa_tl=PP.
<recently read> }
l. ... }
-> \l_tmpa_tl=^^?^^?.
+> \l_tmpa_tl=.
<recently read> }
l. ... }
! Illegal parameter number in definition of \temp.
@@ -319,7 +319,7 @@ l. ... }
You meant to type ## instead of #, right?
Or maybe a } was forgotten somewhere earlier, and things
are all screwed up? I'm going to assume that you meant ##.
-> \temp=\long macro:->^^?^^?.
+> \temp=\long macro:->.
<recently read> }
l. ... }
============================================================
@@ -328,7 +328,7 @@ TEST 4: Errors
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
-Charcode requested out of engine range.
+ Charcode requested out of engine range.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -337,7 +337,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -346,7 +346,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -355,7 +355,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -364,7 +364,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -373,7 +373,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Cannot generate space chars.
+ Cannot generate space chars.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -382,7 +382,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Cannot generate active chars.
+ Cannot generate active chars.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -391,7 +391,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -400,7 +400,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -409,7 +409,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -418,7 +418,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Invalid catcode for char generation.
+ Invalid catcode for char generation.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -427,7 +427,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
-Cannot generate null char as a space.
+ Cannot generate null char as a space.
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index fe6d43d..5d00a03 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
%% Right brace \} Tilde \~}
%%
(expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
\ucharcat at table=\catcodetable5
Defining \cs_set_nopar:cpn on line ...
Defining \cs_set_nopar:cpx on line ...
@@ -4788,7 +4788,7 @@ Defining key expl/native-drivers/true on line ...
Defining key expl/check-declarations on line ...
Defining key expl/log-functions on line ...
Defining \c__expl_def_ext_tl on line ...
-(l3pdfmode.def
+ (l3pdfmode.def
Defining \__driver_state_save: on line ...
Defining \__driver_state_restore: on line ...
Defining \__driver_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl002.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 07f3423..2f31d92 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
%% Right brace \} Tilde \~}
%%
(expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
\ucharcat at table=\catcodetable5
\c_max_int=\count112
\l_tmpa_int=\count113
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 26e6a84..389aadc 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
%% Right brace \} Tilde \~}
%%
(expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
\ucharcat at table=\catcodetable5
Defining \cs_set_nopar:cpn on line ...
Defining \cs_set_nopar:cpx on line ...
@@ -4789,7 +4789,7 @@ Defining key expl/native-drivers/true on line ...
Defining key expl/check-declarations on line ...
Defining key expl/log-functions on line ...
Defining \c__expl_def_ext_tl on line ...
-(l3pdfmode.def
+ (l3pdfmode.def
Defining \__driver_state_save: on line ...
Defining \__driver_state_restore: on line ...
Defining \__driver_literal:n on line ...
diff --git a/l3kernel/testfiles/m3expl004.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 07f3423..2f31d92 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
%% Right brace \} Tilde \~}
%%
(expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
\ucharcat at table=\catcodetable5
\c_max_int=\count112
\l_tmpa_int=\count113
diff --git a/l3kernel/testfiles/m3expl006.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index fff1b10..af3fa28 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.tlg
@@ -18,7 +18,7 @@ Don't change this file in any respect.
%%
Author: Bruno Le Floch and Joseph Wright
(expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
\ucharcat at table=\catcodetable5
\c_max_int=\count112
\l_tmpa_int=\count113
diff --git a/l3kernel/testfiles/m3msg004.luatex.tlg b/l3kernel/testfiles/m3msg004.luatex.tlg
index 320700c..ad52fad 100644
--- a/l3kernel/testfiles/m3msg004.luatex.tlg
+++ b/l3kernel/testfiles/m3msg004.luatex.tlg
@@ -228,7 +228,7 @@ l. ... }
|__msg_kernel_expandable_error:nnnnnn|
! Undefined control sequence.
<argument> \LaTeX3 error:
-(\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
+ (\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -365,7 +365,7 @@ l. ... }
|msg_none:nnnnnn and msg_none:nnxxxx|
! Undefined control sequence.
<argument> \::error
-! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:N \c_empty_tl
+ ! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:N \c_empty_tl
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -374,7 +374,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \::error
-! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
+ ! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/l3packages/xparse/testfiles/xparse002.luatex.tlg b/l3packages/xparse/testfiles/xparse002.luatex.tlg
index 3807ba7..4d0765c 100644
--- a/l3packages/xparse/testfiles/xparse002.luatex.tlg
+++ b/l3packages/xparse/testfiles/xparse002.luatex.tlg
@@ -210,7 +210,7 @@ control sequence to too much text. How can we recover?
My plan is to forget the whole thing and hope for the best.
! Extra }, or forgotten \endgroup.
<argument> ...\foo {gom}{\TYPE {(##1)(##2)(##3)}}\foo {\par }
-bc\DeclareDocumentCommand ...
+ bc\DeclareDocumentCommand ...
l. ...}
I've deleted a group-closing symbol because it seems to be
spurious, as in `$x}$'. But perhaps the } is legitimate and
@@ -233,7 +233,7 @@ control sequence to too much text. How can we recover?
My plan is to forget the whole thing and hope for the best.
! Extra }, or forgotten \endgroup.
<argument> ...efault}}{\TYPE {(##1)(##2)(##3)}}\foo de{\par }
-\DeclareDocumentCommand \f...
+ \DeclareDocumentCommand \f...
l. ...}
I've deleted a group-closing symbol because it seems to be
spurious, as in `$x}$'. But perhaps the } is legitimate and
diff --git a/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg b/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
index ce7f5ef..a9bbe56 100644
--- a/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
@@ -105,7 +105,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
\penalty 0
\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
total height 56.77777 plus 6.0 minus 10.0
-goal height 550.0
+ goal height 550.0
prevdepth 1.94444, prevgraf 4 lines
! OK.
l. ...\showlists
@@ -1199,7 +1199,7 @@ LaTeX Font Info: Font shape `OMS/cmr/m/n' in size <10> not available
.\glue(\parfillskip) 0.0 plus 1.0fil
.\glue(\rightskip) 0.0
total height 164.70274 plus 1.86108
-goal height 550.0
+ goal height 550.0
prevdepth 0.0, prevgraf 12 lines
! OK.
l. ...\showlists
@@ -1284,7 +1284,7 @@ l. ...\showlists
.\glue(\parfillskip) 0.0 plus 1.0fil
.\glue(\rightskip) 0.0
total height 43.2472 plus 1.86108
-goal height 550.0
+ goal height 550.0
prevdepth 3.4, prevgraf 1 line
! OK.
l. ...\showlists
diff --git a/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg b/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
index 2681861..9661c77 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
@@ -95,7 +95,7 @@ Don't change this file in any respect.
\penalty 10000
\penalty 10000
total height 66.6055 plus 3.72217
-goal height 550.0
+ goal height 550.0
### recent contributions:
\glue 9.90276 plus 0.86108
prevdepth 0.0, prevgraf 1 line
diff --git a/l3trial/xbox/testfiles/xbox001.luatex.tlg b/l3trial/xbox/testfiles/xbox001.luatex.tlg
index d3b8fb4..4da10f5 100644
--- a/l3trial/xbox/testfiles/xbox001.luatex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.luatex.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
\myboxa=\box72
> \myboxa=\char"48.
<argument> \newsavebox {\myboxa }\show \myboxa
-\begingroup \newsavebox {\myboxb }\show \my
+ \begingroup \newsavebox {\myboxb }\show \my
l. ... }
Defining \myboxb on line ...
\myboxb=\box73
> \myboxb=\char"49.
<argument> ...begingroup \newsavebox {\myboxb }\show \myboxb
-\endgroup \show \myboxb \n...
+ \endgroup \show \myboxb \n...
l. ... }
> \myboxb=\char"49.
<argument> ...\myboxb }\show \myboxb \endgroup \show \myboxb
-\newsavebox {\myboxa }\sho...
+ \newsavebox {\myboxa }\sho...
l. ... }
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list