summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-28 21:17:44 +0000
committerKarl Berry <karl@freefriends.org>2015-09-28 21:17:44 +0000
commit472e2dc119ba3eca6a8672e7606df6a7dc847a19 (patch)
tree7c10e4ee61b72663387bc5e19e97ddb6c8e57c62 /Master/texmf-dist/tex/latex
parent3b599d9910b4fe668c87ddd32a48d48f8a377560 (diff)
l3 (28sep15)
git-svn-id: svn://tug.org/texlive/trunk@38490 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua267
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty355
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty3
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex701
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty29
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls10
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str.sty76
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty85
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty6
18 files changed, 814 insertions, 784 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index e8fffc16c43..489819a709c 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -17,8 +17,8 @@
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2015/09/14"
-release_ver = "6007"
+release_date = "2015/09/24"
+release_ver = "6068"
-- "module" is a deprecated function in Lua 5.2: as we want the name
-- for other purposes, and it should eventually be 'free', simply
@@ -35,14 +35,14 @@ bundle = bundle or ""
if module == "" and bundle == "" then
if string.match(arg[0], ".*l3build%.lua$") then
print(
- "\n" ..
- "Error: Call l3build using a configuration file, not directly.\n"
- )
+ "\n"
+ .. "Error: Call l3build using a configuration file, not directly.\n"
+ )
else
print(
- "\n" ..
- "Error: Specify either bundle or module in configuration script.\n"
- )
+ "\n"
+ .. "Error: Specify either bundle or module in configuration script.\n"
+ )
end
os.exit(1)
end
@@ -170,19 +170,22 @@ function argparse()
engine = "engine",
["halt-on-error"] = "halt" ,
["halt-on-failure"] = "halt" ,
- help = "help"
+ help = "help" ,
+ quiet = "quiet"
}
local short_options =
{
e = "engine",
h = "help" ,
- H = "halt"
+ H = "halt" ,
+ q = "quiet"
}
local option_args =
{
engine = true ,
halt = false,
- help = false
+ help = false,
+ quiet = false
}
-- arg[1] is a special case: must be a command or "-h"/"--help"
-- Deal with this by assuming help and storing only apparently-valid
@@ -290,6 +293,7 @@ userargs = argparse()
optengines = userargs["engine"]
opthalt = userargs["halt"]
opthelp = userargs["help"]
+optquiet = userargs["quiet"]
-- Convert a file glob into a pattern for use by e.g. string.gub
-- Based on https://github.com/davidm/lua-glob-pattern
@@ -405,23 +409,31 @@ lfs = require("lfs")
-- For cleaning out a directory, which also ensures that it exists
function cleandir(dir)
- mkdir(dir)
- rm(dir, "*")
+ local errorlevel = mkdir(dir)
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
+ return rm(dir, "*")
end
-- Copy files 'quietly'
function cp(glob, source, dest)
+ local errorlevel
for _,i in ipairs(filelist(source, glob)) do
local source = source .. "/" .. i
if os_windows then
- os.execute(
- "copy /y " .. unix_to_win(source) .. " "
- .. unix_to_win(dest) .. " > nul"
- )
+ errorlevel = os.execute(
+ "copy /y " .. unix_to_win(source) .. " "
+ .. unix_to_win(dest) .. " > nul"
+ )
else
- os.execute("cp -f " .. source .. " " .. dest)
+ errorlevel = os.execute("cp -f " .. source .. " " .. dest)
+ end
+ if errorlevel ~=0 then
+ return errorlevel
end
end
+ return 0
end
-- OS-dependent test for a directory
@@ -479,9 +491,11 @@ function mkdir(dir)
-- Windows (with the extensions) will automatically make directory trees
-- but issues a warning if the dir already exists: avoid by including a test
local dir = unix_to_win(dir)
- os.execute("if not exist " .. dir .. "\\nul " .. "mkdir " .. dir)
+ return os.execute(
+ "if not exist " .. dir .. "\\nul " .. "mkdir " .. dir
+ )
else
- os.execute("mkdir -p " .. dir)
+ return os.execute("mkdir -p " .. dir)
end
end
@@ -512,9 +526,9 @@ end
function ren(dir, source, dest)
local dir = dir .. "/"
if os_windows then
- os.execute("ren " .. unix_to_win(dir) .. source .. " " .. dest)
+ return os.execute("ren " .. unix_to_win(dir) .. source .. " " .. dest)
else
- os.execute("mv " .. dir .. source .. " " .. dir .. dest)
+ return os.execute("mv " .. dir .. source .. " " .. dir .. dest)
end
end
@@ -523,6 +537,8 @@ function rm(source, glob)
for _,i in ipairs(filelist(source, glob)) do
os.remove(source .. "/" .. i)
end
+ -- os.remove doesn't give a sensible errorlevel
+ return 0
end
-- Remove a directory tree
@@ -530,9 +546,9 @@ function rmdir(dir)
-- First, make sure it exists to avoid any errors
mkdir(dir)
if os_windows then
- os.execute("rmdir /s /q " .. unix_to_win(dir) )
+ return os.execute("rmdir /s /q " .. unix_to_win(dir) )
else
- os.execute("rm -r " .. dir)
+ return os.execute("rm -r " .. dir)
end
end
@@ -553,18 +569,19 @@ end
-- Do some subtarget for all modules in a bundle
function allmodules(target)
- local errorlevel
for _,i in ipairs(modules) do
print(
- "Running script " .. scriptname .. " with target \"" .. target .. "\" for module "
- .. i
- )
+ "Running script " .. scriptname .. " with target \"" .. target
+ .. "\" for module "
+ .. i
+ )
local engines = ""
if optengines then
engines = " --engine=" .. table.concat(optengines, ",")
end
- errorlevel = run(
- i, "texlua " .. scriptname .. " " .. target
+ local errorlevel = run(
+ i,
+ "texlua " .. scriptname .. " " .. target
.. (opthalt and " -H" or "")
.. engines
)
@@ -672,10 +689,15 @@ end
-- Unpack files needed to support testing/typesetting/unpacking
function depinstall(deps)
+ local errorlevel
for _,i in ipairs(deps) do
print("Installing dependency: " .. i)
- run(i, "texlua " .. scriptname .. " unpack")
+ errorlevel = run(i, "texlua " .. scriptname .. " unpack -q")
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
end
+ return 0
end
-- Convert the raw log file into one for comparison/storage: keeps only
@@ -690,8 +712,8 @@ function formatlog(logfile, newfile, engine)
-- As Lua doesn't allow "(in|out)", a slightly complex approach:
-- do a substitution to check the line is exactly what is required!
string.match(
- string.gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = "
- ) then
+ string.gsub(line, "^\\openin", "\\openout"), "^\\openout%d%d? = "
+ ) then
return true
end
return false
@@ -722,7 +744,7 @@ function formatlog(logfile, newfile, engine)
line = string.gsub(line, "%(%.%/", "(")
-- Zap paths if places other than 'here' are accessible
if checksearch then
- line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%s*$", "(../%1")
+ line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
end
-- Zap map loading of map
line = string.gsub(line, "%{%w?:?[%w/%-]*/pdftex%.map%}", "")
@@ -733,12 +755,15 @@ function formatlog(logfile, newfile, engine)
end
-- TeX90/XeTeX knows only the smaller set of dimension units
line = string.gsub(
- line, "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp"
- )
+ line,
+ "cm, mm, dd, cc, bp, or sp", "cm, mm, dd, cc, nd, nc, bp, or sp"
+ )
-- Normalise a case where fixing a TeX bug changes the message text
line = string.gsub(line, "\\csname\\endcsname ", "\\csname\\endcsname")
-- Zap "on line <num>" and replace with "on line ..."
+ -- Two similar cases, Lua patterns mean we need to do them separately
line = string.gsub(line, "on line %d*", "on line ...")
+ line = string.gsub(line, "on input line %d*", "on input line ...")
-- Tidy up to ^^ notation
for i = 0, 31 do
line = string.gsub(line, string.char(i), "^^" .. string.char(64 + i))
@@ -747,8 +772,10 @@ function formatlog(logfile, newfile, engine)
-- Two stages as line wrapping alters some of them and restore the break
line = string.gsub(line, "^l%.%d+ ", "l. ...")
line = string.gsub(
- line, "%.%.%.l%.%d+ ( *)%}$", "..." .. os_newline .. "l. ...%1}"
- )
+ line,
+ "%.%.%.l%.%d+ ( *)%}$",
+ "..." .. os_newline .. "l. ...%1}"
+ )
-- Remove spaces at the start of lines: deals with the fact that LuaTeX
-- uses a different number to the other engines
line = string.gsub(line, "^%s+", "")
@@ -825,9 +852,9 @@ function formatlualog(logfile, newfile)
m .. " (%-?)%d+%.%d+",
m .. " %1"
.. string.format(
- "%.3f",
- string.match(line, m .. " %-?(%d+%.%d+)") or 0
- )
+ "%.3f",
+ string.match(line, m .. " %-?(%d+%.%d+)") or 0
+ )
)
end
if string.match(line, "glue set %-?%d+%.%d+") then
@@ -841,7 +868,7 @@ function formatlualog(logfile, newfile)
line = round_digits(line, "plus")
line = round_digits(line, "minus")
end
- -- LuaTeX writes ^^M as a new line, which we loose
+ -- LuaTeX writes ^^M as a new line, which we lose
line = string.gsub(line, "%^%^M", "")
-- Remove U+ notation in the "Missing character" message
line = string.gsub(
@@ -917,7 +944,7 @@ function formatlualog(logfile, newfile)
elseif (string.len(lastline) == maxprintline) then
if string.match(line, "\\ETC%.%}$") then
-- If the line wrapped at \ETC we might have lost a space
- return lastline
+ return lastline
.. ((string.match(line, "^\\ETC%.%}$") and " ") or "")
.. line, ""
elseif string.match(line, "^%}%}%}$") then
@@ -998,7 +1025,7 @@ function runcheck(name, hide)
if not locate({unpackdir, testfiledir}, {name .. lveext}) then
print(
"Error: failed to find " .. tlgext .. " or "
- .. lveext .. " file for " .. name .. "!"
+ .. lveext .. " file for " .. name .. "!"
)
os.exit(1)
end
@@ -1072,6 +1099,11 @@ function runtest(name, engine, hide, ext)
string.match(engine, "^u?ptex$") then
realengine = "e" .. engine
end
+ -- Special casing for XeTeX engine
+ local checkopts = checkopts
+ if string.match(engine, "xetex") then
+ checkopts = checkopts .. " -no-pdf"
+ end
local logfile = testdir .. "/" .. name .. logext
local newfile = testdir .. "/" .. name .. "." .. engine .. logext
local asciiopt = ""
@@ -1083,18 +1115,18 @@ function runtest(name, engine, hide, ext)
end
for i = 1, checkruns do
run(
- testdir,
- -- No use of localdir here as the files get copied to testdir:
- -- avoids any paths in the logs
- os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
- .. os_concat ..
- -- Avoid spurious output from (u)pTeX
- os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
- .. os_concat ..
- realengine .. format .. " "
- .. checkopts .. " " .. asciiopt .. lvtfile
- .. (hide and (" > " .. os_null) or "")
- )
+ testdir,
+ -- No use of localdir here as the files get copied to testdir:
+ -- avoids any paths in the logs
+ os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
+ .. os_concat ..
+ -- Avoid spurious output from (u)pTeX
+ os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
+ .. os_concat ..
+ realengine .. format .. " "
+ .. checkopts .. " " .. asciiopt .. lvtfile
+ .. (hide and (" > " .. os_null) or "")
+ )
end
formatlog(logfile, newfile, engine)
-- Store secondary files for this engine
@@ -1337,24 +1369,29 @@ function clean()
-- To make sure that distribdir never contains any stray subdirs,
-- it is entirely removed then recreated rather than simply deleting
-- all of the files
- rmdir(distribdir)
- mkdir(distribdir)
- cleandir(localdir)
- cleandir(testdir)
- cleandir(typesetdir)
- cleandir(unpackdir)
+ local errorlevel =
+ rmdir(distribdir) +
+ mkdir(distribdir) +
+ cleandir(localdir) +
+ cleandir(testdir) +
+ cleandir(typesetdir) +
+ cleandir(unpackdir)
for _,i in ipairs(cleanfiles) do
- rm(".", i)
+ errorlevel = rm(".", i) + errorlevel
end
+ return errorlevel
end
function bundleclean()
- allmodules("clean")
+ local errorlevel = allmodules("clean")
for _,i in ipairs(cleanfiles) do
- rm(".", i)
+ errorlevel = rm(".", i) + errorlevel
end
- rmdir(ctandir)
- rmdir(tdsdir)
+ return (
+ errorlevel +
+ rmdir(ctandir) +
+ rmdir(tdsdir)
+ )
end
-- Check commands are defined
@@ -1404,19 +1441,19 @@ function ctan(standalone)
local exclude = tab_to_str(excludefiles)
-- First, zip up all of the text files
run(
- dir,
- zipexe .. " " .. zipopts .. " -ll ".. zipname .. " " .. "."
- .. (
- (binfiles or exclude) and (" -x" .. binfiles .. " " .. exclude)
- or ""
- )
- )
+ dir,
+ zipexe .. " " .. zipopts .. " -ll ".. zipname .. " " .. "."
+ .. (
+ (binfiles or exclude) and (" -x" .. binfiles .. " " .. exclude)
+ or ""
+ )
+ )
-- Then add the binary ones
run(
- dir,
- zipexe .. " " .. zipopts .. " -g ".. zipname .. " " .. ". -i" ..
- binfiles .. (exclude and (" -x" .. exclude) or "")
- )
+ dir,
+ zipexe .. " " .. zipopts .. " -g ".. zipname .. " " .. ". -i" ..
+ binfiles .. (exclude and (" -x" .. exclude) or "")
+ )
end
local errorlevel
if standalone then
@@ -1543,14 +1580,24 @@ end
-- Locally install files: only deals with those extracted, not docs etc.
function install()
- unpack()
+ local errorlevel = unpack()
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
kpse.set_program_name("latex")
local texmfhome = kpse.var_value("TEXMFHOME")
local installdir = texmfhome .. "/tex/" .. moduledir
- cleandir(installdir)
+ errorlevel = cleandir(installdir)
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
for _,i in ipairs(installfiles) do
- cp(i, unpackdir, installdir)
+ errorlevel = cp(i, unpackdir, installdir)
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
end
+ return 0
end
function save(names)
@@ -1583,7 +1630,7 @@ function save(names)
print(
"Test input \"" .. testfiledir .. "/" .. name .. lvtext
.. "\" not found"
- )
+ )
end
end
end
@@ -1592,25 +1639,47 @@ end
-- Unpack the package files using an 'isolated' system: this requires
-- a copy of the 'basic' DocStrip program, which is used then removed
function unpack()
- depinstall(unpackdeps)
- bundleunpack()
+ local errorlevel = depinstall(unpackdeps)
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
+ errorlevel = bundleunpack()
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
for _,i in ipairs(installfiles) do
- cp(i, unpackdir, localdir)
+ errorlevel = cp(i, unpackdir, localdir)
+ if errorlevel ~= 0 then
+ return errorlevel
+ end
end
+ return 0
end
-- Split off from the main unpack so it can be used on a bundle and not
-- leave only one modules files
bundleunpack = bundleunpack or function(sourcedir)
- mkdir(localdir)
- cleandir(unpackdir)
+ local errorlevel = mkdir(localdir)
+ if errorlevel ~=0 then
+ return errorlevel
+ end
+ errorlevel = cleandir(unpackdir)
+ if errorlevel ~=0 then
+ return errorlevel
+ end
for _,i in ipairs(sourcedir or {"."}) do
for _,j in ipairs(sourcefiles) do
- cp(j, i, unpackdir)
+ errorlevel = cp(j, i, unpackdir)
+ if errorlevel ~=0 then
+ return errorlevel
+ end
end
end
for _,i in ipairs(unpacksuppfiles) do
- cp(i, supportdir, localdir)
+ errorlevel = cp(i, supportdir, localdir)
+ if errorlevel ~=0 then
+ return errorlevel
+ end
end
for _,i in ipairs(unpackfiles) do
for _,j in ipairs(filelist(unpackdir, i)) do
@@ -1621,22 +1690,28 @@ bundleunpack = bundleunpack or function(sourcedir)
-- stops, which confuses Lua)
os.execute(os_yes .. ">>" .. localdir .. "/yes")
local localdir = relpath(localdir, unpackdir)
- run(
+ errorlevel = run(
unpackdir,
os_setenv .. " TEXINPUTS=." .. os_pathsep
.. localdir .. (unpacksearch and os_pathsep or "") ..
os_concat ..
unpackexe .. " " .. unpackopts .. " " .. j .. " < "
.. localdir .. "/yes"
+ .. (optquiet and (" > " .. os_null) or "")
)
+ if errorlevel ~=0 then
+ return errorlevel
+ end
end
end
+ return 0
end
function version()
print(
- "\nl3build Release " .. string.gsub(release_date, "/", "-") ..
- " (SVN r" .. release_ver .. ")\n"
+ "\n"
+ .. "l3build Release " .. string.gsub(release_date, "/", "-")
+ .. " (SVN r" .. release_ver .. ")\n"
)
end
@@ -1700,14 +1775,18 @@ function stdmain(target, files)
help()
end
elseif target == "unpack" then
- unpack()
+ errorlevel = unpack()
elseif target == "version" then
version()
else
help()
end
end
- os.exit(errorlevel)
+ if errorlevel ~= 0 then
+ os.exit(1)
+ else
+ os.exit(0)
+ end
end
-- Allow main function to be disabled 'higher up'
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index 18dea9646a4..8ac2f9772c1 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3sort}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3sort.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental sorting functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index ae812d5afb1..d861dc4236e 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3flag.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental flags}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index da16502dece..d03d173ca60 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,11 +58,11 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{l3tl-build, l3tl-analysis, l3flag, l3str, l3str-convert}
+\RequirePackage{l3tl-build, l3tl-analysis, l3flag, l3str-convert}
\cs_generate_variant:Nn \tl_to_str:n { V }
\cs_new:Npn \__regex_tmp:w { }
\tl_new:N \l__regex_internal_a_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index 199e2dd9d2b..7d20125136d 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,11 +58,11 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{l3tl-build, l3tl-analysis, l3flag, l3str, l3str-convert}
+\RequirePackage{l3tl-build, l3tl-analysis, l3flag, l3str-convert}
\cs_generate_variant:Nn \tl_to_str:n { V }
\cs_new:Npn \__regex_tmp:w { }
\tl_new:N \l__regex_internal_a_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
index e811c9e00a9..eec15a9d29d 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-convert.sty
@@ -46,11 +46,11 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3str-convert.dtx 5998 2015-09-11 19:51:00Z joseph $
+\GetIdInfo$Id: l3str-convert.dtx 6106 2015-09-26 08:54:30Z joseph $
{L3 Experimental string encoding conversions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{l3str,l3tl-analysis,l3tl-build,l3flag}
+\RequirePackage{l3tl-analysis,l3tl-build,l3flag}
\cs_if_exist:NF \use_ii_i:nn
{ \cs_new:Npn \use_ii_i:nn #1#2 { #2 #1 } }
\int_const:Nn \c_max_char_int
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 3449f5b7cac..ab454bf1ad2 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3str-format.dtx 5906 2015-09-02 13:17:05Z mittelba $
+\GetIdInfo$Id: l3str-format.dtx 6009 2015-09-18 08:09:21Z joseph $
{L3 Experimental string formatting}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -138,14 +138,14 @@
\use:nf { #2 #1 }
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
}
}
\cs_new:cpn { __str_format_align_>:nnnN } #1#2#3#4
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
#2 #1
}
@@ -156,7 +156,7 @@
\prg_replicate:nn
{
\int_max:nn \c_zero
- { #3 - \__str_count_unsafe:n { #2 #1 } - \c_one }
+ { #3 - \__str_count:n { #2 #1 } - \c_one }
/ \c_two
}
{#4}
@@ -166,7 +166,7 @@
\prg_replicate:nn
{
\int_max:nn \c_zero
- { #3 - \__str_count_unsafe:n { #2 #1 } }
+ { #3 - \__str_count:n { #2 #1 } }
/ \c_two
}
{#4}
@@ -177,7 +177,7 @@
\use:nf {#2}
{
\prg_replicate:nn
- { \int_max:nn { #3 - \__str_count_unsafe:n { #2 #1 } } { 0 } }
+ { \int_max:nn { #3 - \__str_count:n { #2 #1 } } { 0 } }
{#4}
}
#1
@@ -213,8 +213,8 @@
}
\__str_format_put:nw { {#4} }
\tl_if_empty:nTF {#5}
- { \__str_format_put:nw { \__str_range_unsafe:nnn { {1} {-1} } } }
- { \__str_format_put:nw { \__str_range_unsafe:nnn { {1} {#5} } } }
+ { \__str_format_put:nw { \__str_range:nnn { {1} {-1} } } }
+ { \__str_format_put:nw { \__str_range:nnn { {1} {#5} } } }
\token_if_eq_charcode:NNF #6 s
{
\token_if_eq_charcode:NNF #6 ?
@@ -428,7 +428,7 @@
{
\use:nf
{ #1 . #2 }
- { \prg_replicate:nn { #4 - \__str_count_unsafe:n {#2} } {0} }
+ { \prg_replicate:nn { #4 - \__str_count:n {#2} } {0} }
}
\cs_new:Npn \__str_format_fp_g:wn \s__fp \__fp_chk:w #1#2 ; #3
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
deleted file mode 100644
index db0c177ea56..00000000000
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ /dev/null
@@ -1,355 +0,0 @@
-%%
-%% This is file `l3str.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% l3str-expl.dtx (with options: `package')
-%%
-%% EXPERIMENTAL CODE
-%%
-%% Do not distribute this file without also distributing the
-%% source files specified above.
-%%
-%% Do not distribute a modified version of this file.
-%%
-%% File: l3str.dtx Copyright (C) 2011-2015 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3experimental bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
- {}
- {%
- \PackageError{l3str}{Support package l3kernel too old}
- {%
- Please install an up to date version of l3kernel\MessageBreak
- using your TeX package manager or from CTAN.\MessageBreak
- \MessageBreak
- Loading l3str will abort!%
- }%
- \endinput
- }
-\GetIdInfo$Id: l3str-expl.dtx 6001 2015-09-11 21:50:23Z joseph $
- {L3 Experimental strings}
-\def\ExplFileName{l3str}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\cs_new_eq:NN \str_new:N \tl_new:N
-\cs_generate_variant:Nn \str_new:N { c }
-\tl_map_inline:nn
- {
- { set }
- { gset }
- { const }
- { put_left }
- { gput_left }
- { put_right }
- { gput_right }
- }
- {
- \cs_new_protected:cpx { str_ #1 :Nn } ##1##2
- { \exp_not:c { tl_ #1 :Nx } ##1 { \exp_not:N \tl_to_str:n {##2} } }
- \exp_args:Nc \cs_generate_variant:Nn { str_ #1 :Nn } { Nx , cn , cx }
- }
-\cs_if_exist:NF \c_backslash_str
- { \str_const:Nx \c_backslash_str { \cs_to_str:N \\ } }
-\str_const:Nx \c_left_brace_str { \cs_to_str:N \{ }
-\str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
-\str_const:Nx \c_hash_str { \cs_to_str:N \# }
-\str_const:Nx \c_tilde_str { \cs_to_str:N \~ }
-\str_const:Nx \c_percent_str { \cs_to_str:N \% }
-\str_new:N \l_tmpa_str
-\str_new:N \l_tmpb_str
-\str_new:N \g_tmpa_str
-\str_new:N \g_tmpb_str
-\cs_new_nopar:Npn \str_count_spaces:N
- { \exp_args:No \str_count_spaces:n }
-\cs_new:Npn \str_count_spaces:n #1
- {
- \int_eval:n
- {
- \exp_after:wN \__str_count_spaces_loop:wwwwwwwww
- \tl_to_str:n {#1} ~
- X 7 ~ X 6 ~ X 5 ~ X 4 ~ X 3 ~ X 2 ~ X 1 ~ X 0 ~ X -1 ~
- \q_stop
- }
- }
-\cs_new:Npn \__str_count_spaces_loop:wwwwwwwww #1~#2~#3~#4~#5~#6~#7~#8~#9~
- {
- \if_meaning:w X #9
- \use_i_delimit_by_q_stop:nw
- \fi:
- \c_nine + \__str_count_spaces_loop:wwwwwwwww
- }
-\cs_new_nopar:Npn \str_count:N { \exp_args:No \str_count:n }
-\cs_new:Npn \str_count:n #1
- {
- \__str_count:n
- {
- \str_count_spaces:n {#1}
- + \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1}
- }
- }
-\cs_new:Npn \__str_count_unsafe:n #1
- {
- \__str_count:n
- { \__str_count_loop:NNNNNNNNN #1 }
- }
-\cs_new:Npn \str_count_ignore_spaces:n #1
- {
- \__str_count:n
- { \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1} }
- }
-\cs_new:Npn \__str_count:n #1
- {
- \int_eval:n
- {
- #1
- { X \c_eight } { X \c_seven } { X \c_six }
- { X \c_five } { X \c_four } { X \c_three }
- { X \c_two } { X \c_one } { X \c_zero }
- \q_stop
- }
- }
-\cs_set:Npn \__str_count_loop:NNNNNNNNN #1#2#3#4#5#6#7#8#9
- {
- \if_meaning:w X #9
- \exp_after:wN \use_none_delimit_by_q_stop:w
- \fi:
- \c_nine + \__str_count_loop:NNNNNNNNN
- }
-\cs_new_nopar:Npn \str_head:N { \exp_args:No \str_head:n }
-\cs_set:Npn \str_head:n #1
- {
- \exp_after:wN \__str_head:w
- \tl_to_str:n {#1}
- { { } } ~ \q_stop
- }
-\cs_set:Npn \__str_head:w #1 ~ %
- { \use_i_delimit_by_q_stop:nw #1 { ~ } }
-\cs_new:Npn \str_head_ignore_spaces:n #1
- {
- \exp_after:wN \use_i_delimit_by_q_stop:nw
- \tl_to_str:n {#1} { } \q_stop
- }
-\cs_new_nopar:Npn \str_tail:N { \exp_args:No \str_tail:n }
-\cs_set:Npn \str_tail:n #1
- {
- \exp_after:wN \__str_tail_auxi:w
- \reverse_if:N \if_charcode:w
- \scan_stop: \tl_to_str:n {#1} X X \q_stop
- }
-\cs_set:Npn \__str_tail_auxi:w #1 X #2 \q_stop { \fi: #1 }
-\cs_new:Npn \str_tail_ignore_spaces:n #1
- {
- \exp_after:wN \__str_tail_auxii:w
- \tl_to_str:n {#1} \q_mark \q_mark \q_stop
- }
-\cs_new:Npn \__str_tail_auxii:w #1 #2 \q_mark #3 \q_stop { #2 }
-\group_begin:
-\char_set_lccode:nn { `\* } { `\ }
-\char_set_lccode:nn { `\A } { `\A }
-\tl_to_lowercase:n
- {
- \group_end:
- \cs_new:Npn \__str_to_other:n #1
- {
- \exp_after:wN \__str_to_other_loop:w \tl_to_str:n {#1} ~ %
- A ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ \q_mark \q_stop
- }
- \cs_new:Npn \__str_to_other_loop:w
- #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 ~ #7 ~ #8 ~ #9 \q_stop
- {
- \if_meaning:w A #8
- \__str_to_other_end:w
- \fi:
- \__str_to_other_loop:w
- #9 #1 * #2 * #3 * #4 * #5 * #6 * #7 * #8 * \q_stop
- }
- \cs_new:Npn \__str_to_other_end:w \fi: #1 \q_mark #2 * A #3 \q_stop
- { \fi: #2 }
- }
-\cs_new:Npn \__str_skip_exp_end:w #1;
- {
- \if_int_compare:w #1 > \c_eight
- \exp_after:wN \__str_skip_loop:wNNNNNNNN
- \else:
- \exp_after:wN \__str_skip_end:w
- \int_use:N \__int_eval:w
- \fi:
- #1 ;
- }
-\cs_new:Npn \__str_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
- { \exp_after:wN \__str_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
-\cs_new:Npn \__str_skip_end:w #1 ;
- {
- \exp_after:wN \__str_skip_end:NNNNNNNN
- \if_case:w #1 \exp_stop_f: \or: \or: \or: \or: \or: \or: \or: \or:
- }
-\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_end: }
-\cs_new:Npn \__str_collect_delimit_by_q_stop:w #1;
- { \__str_collect_loop:wn #1 ; { } }
-\cs_new:Npn \__str_collect_loop:wn #1 ;
- {
- \if_int_compare:w #1 > \c_seven
- \exp_after:wN \__str_collect_loop:wnNNNNNNN
- \else:
- \exp_after:wN \__str_collect_end:wn
- \fi:
- #1 ;
- }
-\cs_new:Npn \__str_collect_loop:wnNNNNNNN #1; #2 #3#4#5#6#7#8#9
- {
- \exp_after:wN \__str_collect_loop:wn
- \int_use:N \__int_eval:w #1 - \c_seven ;
- { #2 #3#4#5#6#7#8#9 }
- }
-\cs_new:Npn \__str_collect_end:wn #1 ;
- {
- \exp_after:wN \__str_collect_end:nnnnnnnnw
- \if_case:w \if_int_compare:w #1 > \c_zero #1 \else: 0 \fi: \exp_stop_f:
- \or: \or: \or: \or: \or: \or: \fi:
- }
-\cs_new:Npn \__str_collect_end:nnnnnnnnw #1#2#3#4#5#6#7#8 #9 \q_stop
- { #1#2#3#4#5#6#7#8 }
-\cs_new_nopar:Npn \str_item:Nn { \exp_args:No \str_item:nn }
-\cs_new:Npn \str_item:nn #1#2
- {
- \exp_args:Nf \tl_to_str:n
- {
- \exp_args:Nf \__str_item_unsafe:nn
- { \__str_to_other:n {#1} } {#2}
- }
- }
-\cs_new:Npn \str_item_ignore_spaces:nn #1
- { \exp_args:No \__str_item_unsafe:nn { \tl_to_str:n {#1} } }
-\cs_new:Npn \__str_item_unsafe:nn #1#2
- {
- \exp_after:wN \__str_item:ww
- \int_use:N \__int_eval:w #2 \exp_after:wN ;
- \__int_value:w \__str_count_unsafe:n {#1} ;
- #1 \q_stop
- }
-\cs_new:Npn \__str_item:ww #1; #2;
- {
- \int_compare:nNnTF {#1} < \c_zero
- {
- \int_compare:nNnTF {#1} < {-#2}
- { \use_none_delimit_by_q_stop:w }
- {
- \exp_after:wN \use_i_delimit_by_q_stop:nw
- \exp:w \exp_after:wN \__str_skip_exp_end:w
- \int_use:N \__int_eval:w #1 + #2 ;
- }
- }
- {
- \int_compare:nNnTF {#1} > {#2}
- { \use_none_delimit_by_q_stop:w }
- {
- \exp_after:wN \use_i_delimit_by_q_stop:nw
- \exp:w \__str_skip_exp_end:w #1 ; { }
- }
- }
- }
-\cs_new:Npn \__str_range_normalize:nn #1#2
- {
- \int_eval:n
- {
- \if_int_compare:w #1 < \c_zero
- \if_int_compare:w #1 < -#2 \exp_stop_f:
- \c_zero
- \else:
- #1 + #2 + \c_one
- \fi:
- \else:
- \if_int_compare:w #1 < #2 \exp_stop_f:
- #1
- \else:
- #2
- \fi:
- \fi:
- }
- }
-\cs_new_nopar:Npn \str_range:Nnn { \exp_args:No \str_range:nnn }
-\cs_new:Npn \str_range:nnn #1#2#3
- {
- \exp_args:Nf \tl_to_str:n
- {
- \exp_args:Nf \__str_range_unsafe:nnn
- { \__str_to_other:n {#1} } {#2} {#3}
- }
- }
-\cs_new:Npn \str_range_ignore_spaces:nnn #1
- { \exp_args:No \__str_range_unsafe:nnn { \tl_to_str:n {#1} } }
-\cs_new:Npn \__str_range_unsafe:nnn #1#2#3
- {
- \exp_after:wN \__str_range:www
- \__int_value:w \__str_count_unsafe:n {#1} \exp_after:wN ;
- \int_use:N \__int_eval:w #2 - \c_one \exp_after:wN ;
- \int_use:N \__int_eval:w #3 ;
- #1 \q_stop
- }
-\cs_new:Npn \__str_range:www #1; #2; #3;
- {
- \exp_args:Nf \__str_range:nnw
- { \__str_range_normalize:nn {#2} {#1} }
- { \__str_range_normalize:nn {#3} {#1} }
- }
-\cs_new:Npn \__str_range:nnw #1#2
- {
- \exp_after:wN \__str_collect_delimit_by_q_stop:w
- \int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
- \exp:w \__str_skip_exp_end:w #1 ;
- }
-\prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
- {
- \if_int_compare:w \__str_if_eq_x:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
- = \c_zero \prg_return_true: \else: \prg_return_false: \fi:
- }
-\cs_new_eq:NN \str_show:n \tl_show:n
-\cs_new_eq:NN \str_show:N \tl_show:N
-\cs_generate_variant:Nn \str_show:N { c }
-\cs_new:Npn \str_substr:Nnn #1 { \__str_substr:nnn { \str_range:Nnn #1 } }
-\cs_new:Npn \str_substr:nnn #1 { \__str_substr:nnn { \str_range:nnn {#1} } }
-\cs_new:Npn \str_substr_ignore_spaces:nnn #1
- { \__str_substr:nnn { \str_range_ignore_spaces:nnn {#1} } }
-\cs_new:Npn \__str_substr:nnn #1#2#3
- {
- \tl_if_empty:nTF {#2}
- { \tl_if_empty:nTF {#3} { #1 { 1} { -1 } } { #1 { 1} {#3} } }
- { \tl_if_empty:nTF {#3} { #1 {#2} { -1 } } { #1 {#2} {#3} } }
- }
-\cs_new_eq:NN \c_lbrace_str \c_left_brace_str
-\cs_new_eq:NN \c_rbrace_str \c_right_brace_str
-%%
-%%
-%% End of file `l3str.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
index 61a25616ef7..bfa6d3c04d9 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
@@ -46,11 +46,10 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3tl-analysis.dtx 5899 2015-08-31 21:49:59Z joseph $
+\GetIdInfo$Id: l3tl-analysis.dtx 6106 2015-09-26 08:54:30Z joseph $
{L3 Experimental token lists analysis}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{l3str}
\__scan_new:N \s__tl
\tl_new:N \l__tl_analysis_internal_tl
\cs_new_eq:NN \l__tl_analysis_token ?
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 32b6f0565ee..7048acfca86 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3galley.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 0c0e211dda4..6a392563581 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -82,8 +82,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/09/11}
-\def\ExplFileVersion{6002}
+\def\ExplFileDate{2015/09/27}
+\def\ExplFileVersion{6111}
\begingroup
\def\next{\endgroup}
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -489,7 +489,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3names.dtx 5939 2015-09-07 21:15:55Z joseph $
+\GetIdInfo$Id: l3names.dtx 6108 2015-09-27 08:58:42Z joseph $
{L3 Namespace for primitives}
\let \tex_global:D \global
\let \tex_let:D \let
@@ -1000,8 +1000,9 @@
\__kernel_primitive:NN \rpcode \pdftex_rpcode:D
\__kernel_primitive:NN \synctex \pdftex_synctex:D
\__kernel_primitive:NN \tagcode \pdftex_tagcode:D
+ \__kernel_primitive:NN \suppressfontnotfounderror \xetex_suppressfontnotfounderror:D
\__kernel_primitive:NN \XeTeXcharclass \xetex_charclass:D
- \__kernel_primitive:NN \XeTeXcharglyph \xetex_charcglyph:D
+ \__kernel_primitive:NN \XeTeXcharglyph \xetex_charglyph:D
\__kernel_primitive:NN \XeTeXcountfeatures \xetex_countfeatures:D
\__kernel_primitive:NN \XeTeXcountglyphs \xetex_countglyphs:D
\__kernel_primitive:NN \XeTeXcountselectors \xetex_countselectors:D
@@ -1029,7 +1030,7 @@
\__kernel_primitive:NN \XeTeXlinebreakskip \xetex_linebreakskip:D
\__kernel_primitive:NN \XeTeXlinebreaklocale \xetex_linebreaklocale:D
\__kernel_primitive:NN \XeTeXlinebreakpenalty \xetex_linebreakpenalty:D
- \__kernel_primitive:NN \XeTeXOTcountfeatures \xetex_OTcounfeatures:D
+ \__kernel_primitive:NN \XeTeXOTcountfeatures \xetex_OTcountfeatures:D
\__kernel_primitive:NN \XeTeXOTcountlanguages \xetex_OTcountlanguages:D
\__kernel_primitive:NN \XeTeXOTcountscripts \xetex_OTcountscripts:D
\__kernel_primitive:NN \XeTeXOTfeaturetag \xetex_OTfeaturetag:D
@@ -1084,7 +1085,6 @@
\__kernel_primitive:NN \prehyphenchar \luatex_prehyphenchar:D
\__kernel_primitive:NN \savecatcodetable \luatex_savecatcodetable:D
\__kernel_primitive:NN \scantextokens \luatex_scantextokens:D
- \__kernel_primitive:NN \suppressfontnotfounderror \luatex_suppressfontnotfounderror:D
\__kernel_primitive:NN \suppressifcsnameerror \luatex_suppressifcsnameerror:D
\__kernel_primitive:NN \suppresslongerror \luatex_suppresslongerror:D
\__kernel_primitive:NN \suppressmathparerror \luatex_suppressmathparerror:D
@@ -1320,12 +1320,12 @@
\tex_let:D \luatex_prehyphenchar:D \luatexprehyphenchar
\tex_let:D \luatex_savecatcodetable:D \luatexsavecatcodetable
\tex_let:D \luatex_scantextokens:D \luatexscantextokens
- \tex_let:D \luatex_suppressfontnotfounderror:D \luatexsuppressfontnotfounderror
\tex_let:D \luatex_suppressifcsnameerror:D \luatexsuppressifcsnameerror
\tex_let:D \luatex_suppresslongerror:D \luatexsuppresslongerror
\tex_let:D \luatex_suppressmathparerror:D \luatexsuppressmathparerror
\tex_let:D \luatex_suppressoutererror:D \luatexsuppressoutererror
\tex_let:D \utex_char:D \luatexUchar
+ \tex_let:D \xetex_suppressfontnotfounderror:D \luatexsuppressfontnotfounderror
\tex_let:D \luatex_bodydir:D \luatexbodydir
\tex_let:D \luatex_boxdir:D \luatexboxdir
\tex_let:D \luatex_chardp:D \luatexchardp
@@ -1436,7 +1436,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3basics.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3basics.dtx 6033 2015-09-22 19:48:51Z bruno $
{L3 Basic definitions}
\tex_let:D \if_true: \tex_iftrue:D
\tex_let:D \if_false: \tex_iffalse:D
@@ -1461,7 +1461,6 @@
\tex_let:D \exp_not:n \etex_unexpanded:D
\tex_let:D \exp:w \tex_romannumeral:D
\tex_chardef:D \exp_end: = 0 ~
-
\tex_let:D \token_to_meaning:N \tex_meaning:D
\tex_let:D \cs_meaning:N \tex_meaning:D
\tex_let:D \tl_to_str:n \etex_detokenize:D
@@ -2680,7 +2679,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3tl.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3tl.dtx 6037 2015-09-23 12:41:15Z joseph $
{L3 Token lists}
\cs_new_protected:Npn \tl_new:N #1
{
@@ -2729,7 +2728,6 @@
\prg_new_eq_conditional:NNn \tl_if_exist:N \cs_if_exist:N { TF , T , F , p }
\prg_new_eq_conditional:NNn \tl_if_exist:c \cs_if_exist:c { TF , T , F , p }
\tl_const:Nn \c_empty_tl { }
-\tl_const:Nx \c_job_name_tl { \tex_jobname:D }
\tl_const:Nn \c_space_tl { ~ }
\cs_new_protected:Npn \tl_set:Nn #1#2
{ \cs_set_nopar:Npx #1 { \exp_not:n {#2} } }
@@ -2905,7 +2903,7 @@
{ \use_ii:nn }
{
\char_set_lccode:nn { 0 } { \tex_newlinechar:D }
- \tl_to_lowercase:n { \__tl_set_rescan:NnTF ^^@ } {#1}
+ \tex_lowercase:D { \__tl_set_rescan:NnTF ^^@ } {#1}
}
{ \__tl_set_rescan_multi:n }
{ \__tl_set_rescan_single:nn { ' } }
@@ -2922,7 +2920,7 @@
\int_compare:nNnTF { `#1 } < { `\~ }
{
\char_set_lccode:nn { 0 } { `#1 + 1 }
- \tl_to_lowercase:n { \__tl_set_rescan_single:nn { ^^@ } }
+ \tex_lowercase:D { \__tl_set_rescan_single:nn { ^^@ } }
}
{ \__tl_set_rescan_single_aux:nn { } }
}
@@ -3176,7 +3174,7 @@
\cs_generate_variant:Nn \tl_case:NnF { c }
\cs_generate_variant:Nn \tl_case:NnTF { c }
\cs_new:Npn \__prg_case_end:nw #1#2#3 \q_mark #4#5 \q_stop
- { \c_zero #1 #4 }
+ { \exp_end: #1 #4 }
\cs_new_eq:NN \__tl_case_end:nw \__prg_case_end:nw
\cs_new:Npn \tl_map_function:nN #1#2
{
@@ -3564,7 +3562,7 @@
\tl_new:N \g_tmpb_tl
\tl_new:N \l_tmpa_tl
\tl_new:N \l_tmpb_tl
-%% File: l3str.dtx Copyright (C) 2014-2015 The LaTeX3 Project
+%% File: l3str.dtx Copyright (C) 2011-2015 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -3596,23 +3594,56 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3str.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3str.dtx 6021 2015-09-20 15:10:27Z joseph $
{L3 Strings}
-\cs_new:Npn \str_head:n #1
- {
- \exp_after:wN \__str_head:w
- \tl_to_str:n {#1}
- { { } } ~ \q_stop
- }
-\cs_new:Npn \__str_head:w #1 ~ %
- { \tl_head:w #1 { ~ } }
-\cs_new:Npn \str_tail:n #1
- {
- \exp_after:wN \__str_tail:w
- \reverse_if:N \if_charcode:w
- \scan_stop: \tl_to_str:n {#1} X X \q_stop
- }
-\cs_new:Npn \__str_tail:w #1 X #2 \q_stop { \fi: #1 }
+\group_begin:
+ \cs_set_protected:Npn \__str_tmp:n #1
+ {
+ \tl_if_blank:nF {#1}
+ {
+ \cs_new_eq:cc { str_ #1 :N } { tl_ #1 :N }
+ \exp_args:Nc \cs_generate_variant:Nn { str_ #1 :N } { c }
+ \__str_tmp:n
+ }
+ }
+ \__str_tmp:n
+ { new }
+ { use }
+ { clear }
+ { gclear }
+ { clear_new }
+ { gclear_new }
+ { }
+\group_end:
+\cs_new_eq:NN \str_set_eq:NN \tl_set_eq:NN
+\cs_new_eq:NN \str_gset_eq:NN \tl_gset_eq:NN
+\cs_generate_variant:Nn \str_set_eq:NN { c , Nc , cc }
+\cs_generate_variant:Nn \str_gset_eq:NN { c , Nc , cc }
+\group_begin:
+ \cs_set_protected:Npn \__str_tmp:n #1
+ {
+ \tl_if_blank:nF {#1}
+ {
+ \cs_new_protected:cpx { str_ #1 :Nn } ##1##2
+ { \exp_not:c { tl_ #1 :Nx } ##1 { \exp_not:N \tl_to_str:n {##2} } }
+ \exp_args:Nc \cs_generate_variant:Nn { str_ #1 :Nn } { Nx , cn , cx }
+ \__str_tmp:n
+ }
+ }
+ \__str_tmp:n
+ { set }
+ { gset }
+ { const }
+ { put_left }
+ { gput_left }
+ { put_right }
+ { gput_right }
+ { }
+\group_end:
+\prg_new_eq_conditional:NNn \str_if_exist:N \tl_if_exist:N { p , T , F , TF }
+\prg_new_eq_conditional:NNn \str_if_exist:c \tl_if_exist:c { p , T , F , TF }
+\prg_new_eq_conditional:NNn \str_if_empty:N \tl_if_empty:N { p , T , F , TF }
+\prg_new_eq_conditional:NNn \str_if_empty:c \tl_if_empty:c { p , T , F , TF }
\cs_new:Npn \__str_if_eq_x:nn #1#2 { \pdftex_strcmp:D {#1} {#2} }
\cs_if_exist:NT \luatex_luatexversion:D
{
@@ -3663,6 +3694,15 @@
\if_int_compare:w \__str_if_eq_x:nn {#1} {#2} = \c_zero
\prg_return_true: \else: \prg_return_false: \fi:
}
+\prg_new_conditional:Npnn \str_if_eq:NN #1#2 { p , TF , T , F }
+ {
+ \if_int_compare:w \__str_if_eq_x:nn { \tl_to_str:N #1 } { \tl_to_str:N #2 }
+ = \c_zero \prg_return_true: \else: \prg_return_false: \fi:
+ }
+\cs_generate_variant:Nn \str_if_eq:NNT { c , Nc , cc }
+\cs_generate_variant:Nn \str_if_eq:NNF { c , Nc , cc }
+\cs_generate_variant:Nn \str_if_eq:NNTF { c , Nc , cc }
+\cs_generate_variant:Nn \str_if_eq_p:NN { c , Nc , cc }
\cs_new:Npn \str_case:nn #1#2
{
\exp:w
@@ -3724,6 +3764,251 @@
{ \__str_case_x:nw {#1} }
}
\cs_new_eq:NN \__str_case_end:nw \__prg_case_end:nw
+\cs_new:Npn \__str_to_other:n #1
+ {
+ \exp_after:wN \__str_to_other_loop:w
+ \tl_to_str:n {#1} ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ A ~ \q_mark \q_stop
+ }
+\group_begin:
+\tex_lccode:D `\* = `\ %
+\tex_lccode:D `\A = `\A
+\tex_lowercase:D
+ {
+ \group_end:
+ \cs_new:Npn \__str_to_other_loop:w
+ #1 ~ #2 ~ #3 ~ #4 ~ #5 ~ #6 ~ #7 ~ #8 ~ #9 \q_stop
+ {
+ \if_meaning:w A #8
+ \__str_to_other_end:w
+ \fi:
+ \__str_to_other_loop:w
+ #9 #1 * #2 * #3 * #4 * #5 * #6 * #7 * #8 * \q_stop
+ }
+ \cs_new:Npn \__str_to_other_end:w \fi: #1 \q_mark #2 * A #3 \q_stop
+ { \fi: #2 }
+ }
+\cs_new_nopar:Npn \str_item:Nn { \exp_args:No \str_item:nn }
+\cs_generate_variant:Nn \str_item:Nn { c }
+\cs_new:Npn \str_item:nn #1#2
+ {
+ \exp_args:Nf \tl_to_str:n
+ {
+ \exp_args:Nf \__str_item:nn
+ { \__str_to_other:n {#1} } {#2}
+ }
+ }
+\cs_new:Npn \str_item_ignore_spaces:nn #1
+ { \exp_args:No \__str_item:nn { \tl_to_str:n {#1} } }
+\cs_new:Npn \__str_item:nn #1#2
+ {
+ \exp_after:wN \__str_item:w
+ \int_use:N \__int_eval:w #2 \exp_after:wN ;
+ \__int_value:w \__str_count:n {#1} ;
+ #1 \q_stop
+ }
+\cs_new:Npn \__str_item:w #1; #2;
+ {
+ \int_compare:nNnTF {#1} < \c_zero
+ {
+ \int_compare:nNnTF {#1} < {-#2}
+ { \use_none_delimit_by_q_stop:w }
+ {
+ \exp_after:wN \use_i_delimit_by_q_stop:nw
+ \exp:w \exp_after:wN \__str_skip_exp_end:w
+ \int_use:N \__int_eval:w #1 + #2 ;
+ }
+ }
+ {
+ \int_compare:nNnTF {#1} > {#2}
+ { \use_none_delimit_by_q_stop:w }
+ {
+ \exp_after:wN \use_i_delimit_by_q_stop:nw
+ \exp:w \__str_skip_exp_end:w #1 ; { }
+ }
+ }
+ }
+\cs_new:Npn \__str_skip_exp_end:w #1;
+ {
+ \if_int_compare:w #1 > \c_eight
+ \exp_after:wN \__str_skip_loop:wNNNNNNNN
+ \else:
+ \exp_after:wN \__str_skip_end:w
+ \int_use:N \__int_eval:w
+ \fi:
+ #1 ;
+ }
+\cs_new:Npn \__str_skip_loop:wNNNNNNNN #1; #2#3#4#5#6#7#8#9
+ { \exp_after:wN \__str_skip_exp_end:w \int_use:N \__int_eval:w #1 - \c_eight ; }
+\cs_new:Npn \__str_skip_end:w #1 ;
+ {
+ \exp_after:wN \__str_skip_end:NNNNNNNN
+ \if_case:w #1 \exp_stop_f: \or: \or: \or: \or: \or: \or: \or: \or:
+ }
+\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \exp_end: }
+\cs_new_nopar:Npn \str_range:Nnn { \exp_args:No \str_range:nnn }
+\cs_generate_variant:Nn \str_range:Nnn { c }
+\cs_new:Npn \str_range:nnn #1#2#3
+ {
+ \exp_args:Nf \tl_to_str:n
+ {
+ \exp_args:Nf \__str_range:nnn
+ { \__str_to_other:n {#1} } {#2} {#3}
+ }
+ }
+\cs_new:Npn \str_range_ignore_spaces:nnn #1
+ { \exp_args:No \__str_range:nnn { \tl_to_str:n {#1} } }
+\cs_new:Npn \__str_range:nnn #1#2#3
+ {
+ \exp_after:wN \__str_range:w
+ \__int_value:w \__str_count:n {#1} \exp_after:wN ;
+ \int_use:N \__int_eval:w #2 - \c_one \exp_after:wN ;
+ \int_use:N \__int_eval:w #3 ;
+ #1 \q_stop
+ }
+\cs_new:Npn \__str_range:w #1; #2; #3;
+ {
+ \exp_args:Nf \__str_range:nnw
+ { \__str_range_normalize:nn {#2} {#1} }
+ { \__str_range_normalize:nn {#3} {#1} }
+ }
+\cs_new:Npn \__str_range:nnw #1#2
+ {
+ \exp_after:wN \__str_collect_delimit_by_q_stop:w
+ \int_use:N \__int_eval:w #2 - #1 \exp_after:wN ;
+ \exp:w \__str_skip_exp_end:w #1 ;
+ }
+\cs_new:Npn \__str_range_normalize:nn #1#2
+ {
+ \int_eval:n
+ {
+ \if_int_compare:w #1 < \c_zero
+ \if_int_compare:w #1 < -#2 \exp_stop_f:
+ \c_zero
+ \else:
+ #1 + #2 + \c_one
+ \fi:
+ \else:
+ \if_int_compare:w #1 < #2 \exp_stop_f:
+ #1
+ \else:
+ #2
+ \fi:
+ \fi:
+ }
+ }
+\cs_new:Npn \__str_collect_delimit_by_q_stop:w #1;
+ { \__str_collect_loop:wn #1 ; { } }
+\cs_new:Npn \__str_collect_loop:wn #1 ;
+ {
+ \if_int_compare:w #1 > \c_seven
+ \exp_after:wN \__str_collect_loop:wnNNNNNNN
+ \else:
+ \exp_after:wN \__str_collect_end:wn
+ \fi:
+ #1 ;
+ }
+\cs_new:Npn \__str_collect_loop:wnNNNNNNN #1; #2 #3#4#5#6#7#8#9
+ {
+ \exp_after:wN \__str_collect_loop:wn
+ \int_use:N \__int_eval:w #1 - \c_seven ;
+ { #2 #3#4#5#6#7#8#9 }
+ }
+\cs_new:Npn \__str_collect_end:wn #1 ;
+ {
+ \exp_after:wN \__str_collect_end:nnnnnnnnw
+ \if_case:w \if_int_compare:w #1 > \c_zero #1 \else: 0 \fi: \exp_stop_f:
+ \or: \or: \or: \or: \or: \or: \fi:
+ }
+\cs_new:Npn \__str_collect_end:nnnnnnnnw #1#2#3#4#5#6#7#8 #9 \q_stop
+ { #1#2#3#4#5#6#7#8 }
+\cs_new_nopar:Npn \str_count_spaces:N
+ { \exp_args:No \str_count_spaces:n }
+\cs_generate_variant:Nn \str_count_spaces:N { c }
+\cs_new:Npn \str_count_spaces:n #1
+ {
+ \int_eval:n
+ {
+ \exp_after:wN \__str_count_spaces_loop:w
+ \tl_to_str:n {#1} ~
+ X 7 ~ X 6 ~ X 5 ~ X 4 ~ X 3 ~ X 2 ~ X 1 ~ X 0 ~ X -1 ~
+ \q_stop
+ }
+ }
+\cs_new:Npn \__str_count_spaces_loop:w #1~#2~#3~#4~#5~#6~#7~#8~#9~
+ {
+ \if_meaning:w X #9
+ \use_i_delimit_by_q_stop:nw
+ \fi:
+ \c_nine + \__str_count_spaces_loop:w
+ }
+\cs_new_nopar:Npn \str_count:N { \exp_args:No \str_count:n }
+\cs_generate_variant:Nn \str_count:N { c }
+\cs_new:Npn \str_count:n #1
+ {
+ \__str_count_aux:n
+ {
+ \str_count_spaces:n {#1}
+ + \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1}
+ }
+ }
+\cs_new:Npn \__str_count:n #1
+ {
+ \__str_count_aux:n
+ { \__str_count_loop:NNNNNNNNN #1 }
+ }
+\cs_new:Npn \str_count_ignore_spaces:n #1
+ {
+ \__str_count_aux:n
+ { \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1} }
+ }
+\cs_new:Npn \__str_count_aux:n #1
+ {
+ \int_eval:n
+ {
+ #1
+ { X \c_eight } { X \c_seven } { X \c_six }
+ { X \c_five } { X \c_four } { X \c_three }
+ { X \c_two } { X \c_one } { X \c_zero }
+ \q_stop
+ }
+ }
+\cs_new:Npn \__str_count_loop:NNNNNNNNN #1#2#3#4#5#6#7#8#9
+ {
+ \if_meaning:w X #9
+ \exp_after:wN \use_none_delimit_by_q_stop:w
+ \fi:
+ \c_nine + \__str_count_loop:NNNNNNNNN
+ }
+\cs_new_nopar:Npn \str_head:N { \exp_args:No \str_head:n }
+\cs_generate_variant:Nn \str_head:N { c }
+\cs_set:Npn \str_head:n #1
+ {
+ \exp_after:wN \__str_head:w
+ \tl_to_str:n {#1}
+ { { } } ~ \q_stop
+ }
+\cs_set:Npn \__str_head:w #1 ~ %
+ { \use_i_delimit_by_q_stop:nw #1 { ~ } }
+\cs_new:Npn \str_head_ignore_spaces:n #1
+ {
+ \exp_after:wN \use_i_delimit_by_q_stop:nw
+ \tl_to_str:n {#1} { } \q_stop
+ }
+\cs_new_nopar:Npn \str_tail:N { \exp_args:No \str_tail:n }
+\cs_generate_variant:Nn \str_tail:N { c }
+\cs_set:Npn \str_tail:n #1
+ {
+ \exp_after:wN \__str_tail_auxi:w
+ \reverse_if:N \if_charcode:w
+ \scan_stop: \tl_to_str:n {#1} X X \q_stop
+ }
+\cs_set:Npn \__str_tail_auxi:w #1 X #2 \q_stop { \fi: #1 }
+\cs_new:Npn \str_tail_ignore_spaces:n #1
+ {
+ \exp_after:wN \__str_tail_auxii:w
+ \tl_to_str:n {#1} \q_mark \q_mark \q_stop
+ }
+\cs_new:Npn \__str_tail_auxii:w #1 #2 \q_mark #3 \q_stop { #2 }
\cs_new:Npn \str_fold_case:n #1 { \__str_change_case:nn {#1} { fold } }
\cs_new:Npn \str_lower_case:n #1 { \__str_change_case:nn {#1} { lower } }
\cs_new:Npn \str_upper_case:n #1 { \__str_change_case:nn {#1} { upper } }
@@ -3768,6 +4053,25 @@
{ c__unicode_ #9 _ #6 _X_ #7 _tl }
{ #8 }
}
+\str_const:Nx \c_ampersand_str { \cs_to_str:N \& }
+\str_const:Nx \c_atsign_str { \cs_to_str:N \@ }
+\str_const:Nx \c_backslash_str { \cs_to_str:N \\ }
+\str_const:Nx \c_left_brace_str { \cs_to_str:N \{ }
+\str_const:Nx \c_right_brace_str { \cs_to_str:N \} }
+\str_const:Nx \c_circumflex_str { \cs_to_str:N \^ }
+\str_const:Nx \c_colon_str { \cs_to_str:N \: }
+\str_const:Nx \c_dollar_str { \cs_to_str:N \$ }
+\str_const:Nx \c_hash_str { \cs_to_str:N \# }
+\str_const:Nx \c_percent_str { \cs_to_str:N \% }
+\str_const:Nx \c_tilde_str { \cs_to_str:N \~ }
+\str_const:Nx \c_underscore_str { \cs_to_str:N \_ }
+\str_new:N \l_tmpa_str
+\str_new:N \l_tmpb_str
+\str_new:N \g_tmpa_str
+\str_new:N \g_tmpb_str
+\cs_new_eq:NN \str_show:n \tl_show:n
+\cs_new_eq:NN \str_show:N \tl_show:N
+\cs_generate_variant:Nn \str_show:N { c }
%% File: l3seq.dtx Copyright (C) 1990-2015 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
@@ -4361,7 +4665,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3int.dtx 5987 2015-09-11 05:44:48Z joseph $
+\GetIdInfo$Id: l3int.dtx 6089 2015-09-25 13:29:50Z mittelba $
{L3 Integers}
\cs_new_eq:NN \__int_value:w \tex_number:D
\cs_new_eq:NN \__int_eval:w \etex_numexpr:D
@@ -4465,8 +4769,7 @@
\cs_if_exist:NT \luatex_luatexversion:D { 1 }
\cs_if_exist:NT \uptex_disablecjktoken:D
{ \if_int_compare:w \ptex_jis:D "2121 = "3000 ~ 1 \fi: }
- \cs_if_exist:NT \xetex_XeTeXversion:D { 1 }
- ~
+ \cs_if_exist:NT \xetex_XeTeXversion:D { 1 } ~
\cs_if_exist:NTF \uptex_disablecjktoken:D
{ \cs_new_eq:NN \__int_constdef:Nw \uptex_kchardef:D }
{ \cs_new_eq:NN \__int_constdef:Nw \tex_chardef:D }
@@ -4525,7 +4828,7 @@
\cs_generate_variant:Nn \int_set:Nn { c }
\cs_generate_variant:Nn \int_gset:Nn { c }
\cs_new_eq:NN \int_use:N \tex_the:D
-\cs_new:Npn \int_use:c #1 { \int_use:N \cs:w #1 \cs_end: }
+\cs_new:Npn \int_use:c #1 { \tex_the:D \cs:w #1 \cs_end: }
\cs_new_protected_nopar:Npn \__prg_compare_error:
{
\if_int_compare:w \c_zero \c_zero \fi:
@@ -6228,7 +6531,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3token.dtx 5893 2015-08-26 16:16:52Z mittelba $
+\GetIdInfo$Id: l3token.dtx 6040 2015-09-23 12:41:32Z joseph $
{L3 Experimental token manipulation}
\group_begin:
\tex_catcode:D `@ = \c_eleven
@@ -6237,7 +6540,7 @@
{
\group_begin:
\char_set_lccode:nn { 0 } {#1}
- \tl_to_lowercase:n
+ \tex_lowercase:D
{ \group_end: \__char_set_catcode:Nn ^^@ } {#2}
}
\tex_catcode:D \c_zero = \c_thirteen
@@ -6256,7 +6559,7 @@
{
\group_begin:
\char_set_lccode:nn { 0 } { `#1 }
- \tl_to_lowercase:n
+ \tex_lowercase:D
{
\group_end:
\seq_if_in:NnF \l_char_active_seq { ^^@ }
@@ -6519,21 +6822,18 @@
\if_charcode:w \exp_not:N #1 \exp_not:N #2
\prg_return_true: \else: \prg_return_false: \fi:
}
-\group_begin:
-\char_set_catcode_other:N \M
-\char_set_catcode_other:N \A
-\char_set_lccode:nn { `\; } { `\: }
-\char_set_lccode:nn { `\T } { `\T }
-\char_set_lccode:nn { `\F } { `\F }
-\tl_to_lowercase:n
+\use:x
{
- \group_end:
- \prg_new_conditional:Npnn \token_if_macro:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \exp_not:N \token_if_macro:N ##1
+ { p , T , F , TF }
{
- \exp_after:wN \__token_if_macro_p:w
- \token_to_meaning:N #1 MA; \q_stop
+ \exp_not:N \exp_after:wN \exp_not:N \__token_if_macro_p:w
+ \exp_not:N \token_to_meaning:N ##1 \tl_to_str:n { ma : }
+ \exp_not:N \q_stop
}
- \cs_new:Npn \__token_if_macro_p:w #1 MA #2 ; #3 \q_stop
+ \cs_new:Npn \exp_not:N \__token_if_macro_p:w
+ ##1 \tl_to_str:n { ma } ##2 \c_colon_str ##3 \exp_not:N \q_stop
+ }
{
\if_int_compare:w \__str_if_eq_x:nn { #2 } { cro } = \c_zero
\prg_return_true:
@@ -6541,7 +6841,6 @@
\prg_return_false:
\fi:
}
- }
\prg_new_conditional:Npnn \token_if_cs:N #1 { p , T , F , TF }
{
\if_catcode:w \exp_not:N #1 \scan_stop:
@@ -6567,7 +6866,7 @@
\char_set_lccode:nn { `Z } { `d }
\tl_map_inline:nn { A C E G H I K L M O P R S U X Y Z R " }
{ \char_set_catcode:nn { `#1 } \c_twelve }
-\tl_to_lowercase:n
+\tex_lowercase:D
{
\group_end:
\prg_new_conditional:Npnn \token_if_chardef:N #1 { p , T , F , TF }
@@ -6721,30 +7020,32 @@
}
\cs_new:Npn \__token_if_long_macro:w #1 LOXG~MACRO #2 \q_stop { #1 ~ }
}
-\tex_chardef:D \c_token_A_int = `A ~ %
-\group_begin:
-\char_set_catcode_other:N \;
-\char_set_lccode:nn { `\; } { `\: }
-\char_set_lccode:nn { `\T } { `\T }
-\char_set_lccode:nn { `\F } { `\F }
-\tl_to_lowercase:n {
- \group_end:
- \prg_new_conditional:Npnn \token_if_primitive:N #1 { p , T , F , TF }
- {
- \token_if_macro:NTF #1
- \prg_return_false:
- {
- \exp_after:wN \__token_if_primitive:NNw
- \token_to_meaning:N #1 ; ; ; \q_stop #1
- }
- }
- \cs_new:Npn \__token_if_primitive:NNw #1#2 #3 ; #4 \q_stop
- {
- \tl_if_empty:oTF { \__token_if_primitive_space:w #3 ~ }
- { \__token_if_primitive_loop:N #3 ; \q_stop }
- { \__token_if_primitive_nullfont:N }
- }
-}
+\tex_chardef:D \c__token_A_int = `A ~ %
+\use:x
+ {
+ \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N ##1
+ { p , T , F , TF }
+ {
+ \exp_not:N \token_if_macro:NTF ##1
+ \exp_not:N \prg_return_false:
+ {
+ \exp_not:N \exp_after:wN \exp_not:N \__token_if_primitive:NNw
+ \exp_not:N \token_to_meaning:N ##1
+ \tl_to_str:n { : : : } \exp_not:N \q_stop ##1
+ }
+ }
+ \cs_new:Npn \exp_not:N \__token_if_primitive:NNw
+ ##1##2 ##3 \c_colon_str ##4 \exp_not:N \q_stop
+ {
+ \exp_not:N \tl_if_empty:oTF
+ { \exp_not:N \__token_if_primitive_space:w ##3 ~ }
+ {
+ \exp_not:N \__token_if_primitive_loop:N ##3
+ \c_colon_str \exp_not:N \q_stop
+ }
+ { \exp_not:N \__token_if_primitive_nullfont:N }
+ }
+ }
\cs_new:Npn \__token_if_primitive_space:w #1 ~ { }
\cs_new:Npn \__token_if_primitive_nullfont:N #1
{
@@ -6756,7 +7057,7 @@
}
\cs_new:Npn \__token_if_primitive_loop:N #1
{
- \if_int_compare:w `#1 < \c_token_A_int %
+ \if_int_compare:w `#1 < \c__token_A_int %
\exp_after:wN \__token_if_primitive:Nw
\exp_after:wN #1
\else:
@@ -7322,7 +7623,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3msg.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3msg.dtx 6037 2015-09-23 12:41:15Z joseph $
{L3 Messages}
\tl_new:N \l__msg_internal_tl
\tl_const:Nn \c__msg_text_prefix_tl { msg~text~>~ }
@@ -7447,7 +7748,7 @@
\char_set_lccode:nn {`\}} {`\ }
\char_set_lccode:nn {`\&} {`\!}
\char_set_catcode_active:N \&
-\tl_to_lowercase:n
+\tex_lowercase:D
{
\group_end:
\cs_new_protected:Npn \__msg_interrupt_text:n #1
@@ -7983,7 +8284,7 @@
\char_set_lccode:nn { `L } { `L }
\char_set_lccode:nn { `T } { `T }
\char_set_lccode:nn { `X } { `X }
-\tl_to_lowercase:n
+\tex_lowercase:D
{
\cs_new:Npx \__msg_expandable_error:n #1
{
@@ -8141,7 +8442,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3file.dtx 5786 2015-08-05 16:18:39Z bruno $
+\GetIdInfo$Id: l3file.dtx 6037 2015-09-23 12:41:15Z joseph $
{L3 File and I/O operations}
\tl_new:N \g_file_current_name_tl
\cs_if_exist:NT \@currname
@@ -8523,7 +8824,7 @@
\group_begin:
\char_set_catcode_other:N \*
\char_set_lccode:nn {`\*} {`\ }
- \tl_to_lowercase:n { \tl_const:Nn \c_catcode_other_space_tl { * } }
+ \tex_lowercase:D { \tl_const:Nn \c_catcode_other_space_tl { * } }
\group_end:
\group_begin:
\int_set_eq:NN \tex_escapechar:D \c_minus_one
@@ -8611,7 +8912,7 @@
\cs_new_protected_nopar:Npn \__iow_wrap_word:
{
\int_set:Nn \l__iow_current_word_int
- { \__str_count_ignore_spaces:N \l__iow_current_word_tl }
+ { \exp_args:No \str_count_ignore_spaces:n \l__iow_current_word_tl }
\int_add:Nn \l__iow_current_line_int { \l__iow_current_word_int }
\int_compare:nNnTF \l__iow_current_line_int < \l__iow_target_count_int
{ \__iow_wrap_word_fits: }
@@ -8681,25 +8982,6 @@
{ \l__iow_current_line_tl }
\use_none_delimit_by_q_stop:w
}
-\cs_new_nopar:Npn \__str_count_ignore_spaces:N
- { \exp_args:No \__str_count_ignore_spaces:n }
-\cs_new:Npn \__str_count_ignore_spaces:n #1
- {
- \__int_value:w \__int_eval:w
- \exp_after:wN \__str_count_loop:NNNNNNNNN \tl_to_str:n {#1}
- { X8 } { X7 } { X6 } { X5 } { X4 } { X3 } { X2 } { X1 } { X0 }
- \q_stop
- \__int_eval_end:
- }
-\cs_new:Npn \__str_count_loop:NNNNNNNNN #1#2#3#4#5#6#7#8#9
- {
- \if_catcode:w X #9
- \exp_after:wN \use_none_delimit_by_q_stop:w
- \else:
- 9 +
- \exp_after:wN \__str_count_loop:NNNNNNNNN
- \fi:
- }
\__msg_kernel_new:nnnn { kernel } { file-not-found }
{ File~'#1'~not~found. }
{
@@ -8760,7 +9042,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3skip.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3skip.dtx 6089 2015-09-25 13:29:50Z mittelba $
{L3 Dimensions and skips}
\cs_new_eq:NN \if_dim:w \tex_ifdim:D
\cs_new_eq:NN \__dim_eval:w \etex_dimexpr:D
@@ -8976,7 +9258,7 @@
\cs_new:Npn \dim_eval:n #1
{ \dim_use:N \__dim_eval:w #1 \__dim_eval_end: }
\cs_new_eq:NN \dim_use:N \tex_the:D
-\cs_generate_variant:Nn \dim_use:N { c }
+\cs_new:Npn \dim_use:c #1 { \tex_the:D \cs:w #1 \cs_end: }
\cs_new:Npn \dim_to_decimal:n #1
{
\exp_after:wN
@@ -9085,7 +9367,7 @@
\cs_new:Npn \skip_eval:n #1
{ \skip_use:N \etex_glueexpr:D #1 \scan_stop: }
\cs_new_eq:NN \skip_use:N \tex_the:D
-\cs_generate_variant:Nn \skip_use:N { c }
+\cs_new:Npn \skip_use:c #1 { \tex_the:D \cs:w #1 \cs_end: }
\cs_new_eq:NN \skip_horizontal:N \tex_hskip:D
\cs_new:Npn \skip_horizontal:n #1
{ \skip_horizontal:N \etex_glueexpr:D #1 \scan_stop: }
@@ -9200,7 +9482,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3keys.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3keys.dtx 6037 2015-09-23 12:41:15Z joseph $
{L3 Key-value interfaces}
\int_new:N \g__keyval_level_int
\tl_new:N \l__keyval_key_tl
@@ -9210,24 +9492,24 @@
\group_begin:
\char_set_catcode_active:n { `\= }
\char_set_catcode_active:n { `\, }
- \char_set_lccode:nn { `\8 } { `\= }
- \char_set_lccode:nn { `\9 } { `\, }
-\tl_to_lowercase:n
- {
- \group_end:
- \cs_new_protected:Npn \__keyval_parse:n #1
- {
- \group_begin:
- \tl_set:Nn \l__keyval_sanitise_tl {#1}
- \tl_replace_all:Nnn \l__keyval_sanitise_tl { = } { 8 }
- \tl_replace_all:Nnn \l__keyval_sanitise_tl { , } { 9 }
- \tl_clear:N \l__keyval_parse_tl
- \exp_after:wN \__keyval_parse_elt:w \exp_after:wN
- \q_nil \l__keyval_sanitise_tl 9 \q_recursion_tail 9 \q_recursion_stop
- \exp_after:wN \group_end:
- \l__keyval_parse_tl
- }
- }
+ \cs_new_protected:Npx \__keyval_parse:n #1
+ {
+ \group_begin:
+ \tl_set:Nn \exp_not:N \l__keyval_sanitise_tl {#1}
+ \tl_replace_all:Nnn \exp_not:N \l__keyval_sanitise_tl
+ { \exp_not:N = } { \token_to_str:N = }
+ \tl_replace_all:Nnn \exp_not:N \l__keyval_sanitise_tl
+ { \exp_not:N , } { \token_to_str:N , }
+ \tl_clear:N \exp_not:N \l__keyval_parse_tl
+ \exp_not:N \exp_after:wN
+ \exp_not:N \__keyval_parse_elt:w \exp_not:N \exp_after:wN
+ \exp_not:N \q_nil \exp_not:N \l__keyval_sanitise_tl
+ \token_to_str:N , \exp_not:N \q_recursion_tail
+ \token_to_str:N , \exp_not:N \q_recursion_stop
+ \exp_not:N \exp_after:wN \group_end:
+ \exp_not:N \l__keyval_parse_tl
+ }
+\group_end:
\cs_new_protected:Npn \__keyval_parse_elt:w #1 ,
{
\tl_if_blank:oF { \use_none:n #1 }
@@ -10911,20 +11193,17 @@
\cs_new:Npn \__fp_parse_expand:w #1 { \exp_end_continue_f:w #1 }
\cs_new:Npn \__fp_parse_return_semicolon:w
#1 \fi: \__fp_parse_expand:w { \fi: ; #1 }
-\group_begin:
-\char_set_catcode_other:N \S
-\char_set_catcode_other:N \F
-\char_set_catcode_other:N \P
-\char_set_lccode:nn { `\- } { `\_ }
-\tl_to_lowercase:n
+\cs_new:Npx \__fp_type_from_scan:N #1
{
- \group_end:
- \cs_new:Npn \__fp_type_from_scan:N #1
- {
- \exp_after:wN \__fp_type_from_scan:w
- \token_to_str:N #1 \q_mark S--FP-? \q_mark \q_stop
- }
- \cs_new:Npn \__fp_type_from_scan:w #1 S--FP #2 \q_mark #3 \q_stop {#2}
+ \exp_not:N \exp_after:wN \exp_not:N \__fp_type_from_scan:w
+ \exp_not:N \token_to_str:N #1 \exp_not:N \q_mark
+ \tl_to_str:n { s__fp _? } \exp_not:N \q_mark \exp_not:N \q_stop
+ }
+\use:x
+ {
+ \cs_new:Npn \exp_not:N \__fp_type_from_scan:w
+ ##1 \tl_to_str:n { s__fp } ##2 \exp_not:N \q_mark ##3 \exp_not:N \q_stop
+ {##2}
}
\cs_set_protected:Npn \__fp_tmp:w #1 #2 #3
{
@@ -11016,28 +11295,27 @@
\exp_after:wN \__fp_parse_exponent:N
\exp:w \__fp_parse_expand:w
}
-\group_begin:
-\char_set_catcode_other:N \P
-\char_set_catcode_other:N \T
-\char_set_catcode_other:N \M
-\char_set_catcode_other:N \U
-\tl_to_lowercase:n
+\cs_new:Npx \__fp_parse_one_register_aux:Nw #1
{
- \group_end:
- \cs_new:Npn \__fp_parse_one_register_aux:Nw #1
+ \exp_not:n
{
\exp_after:wN \use:nn
\exp_after:wN \__fp_parse_one_register_auxii:wwwNw
- \exp_after:wN { \tex_the:D #1 }
- ; \__fp_parse_one_register_dim:ww
- PT ; \__fp_parse_one_register_mu:www
- . PT ; \__fp_parse_one_register_int:www
- \q_stop
}
- \cs_new:Npn \__fp_parse_one_register_auxii:wwwNw
- #1 . #2 PT #3 ; #4#5 \q_stop { #4 #1.#2; }
- \cs_new:Npn \__fp_parse_one_register_mu:www #1 MU; #2;
- { \__fp_parse_one_register_dim:ww #1; }
+ \exp_not:N \exp_after:wN { \exp_not:N \tex_the:D #1 }
+ ; \exp_not:N \__fp_parse_one_register_dim:ww
+ \tl_to_str:n { pt } ; \exp_not:N \__fp_parse_one_register_mu:www
+ . \tl_to_str:n { pt } ; \exp_not:N \__fp_parse_one_register_int:www
+ \exp_not:N \q_stop
+ }
+\use:x
+ {
+ \cs_new:Npn \exp_not:N \__fp_parse_one_register_auxii:wwwNw
+ ##1 . ##2 \tl_to_str:n { pt } ##3 ; ##4##5 \exp_not:N \q_stop
+ { ##4 ##1.##2; }
+ \cs_new:Npn \exp_not:N \__fp_parse_one_register_mu:www
+ ##1 \tl_to_str:n { mu } ; ##2 ;
+ { \exp_not:N \__fp_parse_one_register_dim:ww ##1 ; }
}
\cs_new:Npn \__fp_parse_one_register_int:www #1; #2.; #3;
{ \__fp_parse:n { #1 e #3 } }
@@ -16745,7 +17023,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3candidates.dtx 6002 2015-09-11 22:13:30Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 6039 2015-09-23 12:41:26Z joseph $
{L3 Experimental additions to l3kernel}
\cs_new_protected_nopar:Npn \cs_log:N
{ \__msg_log_next: \cs_show:N }
@@ -17621,56 +17899,6 @@
\cs_new:Npn \__tl_act_count_space:n #1 { 1 + }
\cs_new:Npn \__tl_act_count_group:nn #1 #2
{ 2 + \tl_count_tokens:n {#2} + }
-\tl_const:Nn \c__tl_act_uppercase_tl
- {
- aA bB cC dD eE fF gG hH iI jJ kK lL mM
- nN oO pP qQ rR sS tT uU vV wW xX yY zZ
- }
-\tl_const:Nn \c__tl_act_lowercase_tl
- {
- Aa Bb Cc Dd Ee Ff Gg Hh Ii Jj Kk Ll Mm
- Nn Oo Pp Qq Rr Ss Tt Uu Vv Ww Xx Yy Zz
- }
-\cs_new:Npn \tl_expandable_uppercase:n #1
- {
- \etex_unexpanded:D \exp_after:wN
- {
- \exp:w
- \__tl_act_case_aux:nn { \c__tl_act_uppercase_tl } {#1}
- }
- }
-\cs_new:Npn \tl_expandable_lowercase:n #1
- {
- \etex_unexpanded:D \exp_after:wN
- {
- \exp:w
- \__tl_act_case_aux:nn { \c__tl_act_lowercase_tl } {#1}
- }
- }
-\cs_new:Npn \__tl_act_case_aux:nn
- {
- \__tl_act:NNNnn
- \__tl_act_case_normal:nN
- \__tl_act_case_group:nn
- \__tl_act_case_space:n
- }
-\cs_new:Npn \__tl_act_case_space:n #1 { \__tl_act_output:n {~} }
-\cs_new:Npn \__tl_act_case_normal:nN #1 #2
- {
- \exp_args:Nf \__tl_act_output:n
- {
- \exp_args:NNo \str_case:nnF #2 {#1}
- { \exp_stop_f: #2 }
- }
- }
-\cs_new:Npn \__tl_act_case_group:nn #1 #2
- {
- \exp_after:wN \__tl_act_output:n \exp_after:wN
- {
- \exp_after:wN
- { \exp:w \__tl_act_case_aux:nn {#1} {#2} }
- }
- }
\cs_new_protected_nopar:Npn \tl_set_from_file:Nnn
{ \__tl_set_from_file:NNnn \tl_set:Nn }
\cs_new_protected_nopar:Npn \tl_gset_from_file:Nnn
@@ -18766,12 +18994,7 @@
\__msg_kernel_new:nnn { kernel } { char-space }
{ Cannot~generate~space~chars. }
\group_begin:
- \char_set_catcode_other:N \O
- \char_set_catcode_other:N \U
- \char_set_catcode_other:N \T
- \char_set_catcode_other:N \E
- \char_set_catcode_other:N \R
- \tl_to_lowercase:n
+ \cs_set_protected:Npn \__peek_tmp:w #1 \q_stop
{
\cs_new_protected_nopar:Npn \__peek_execute_branches_N_type:
{
@@ -18783,16 +19006,17 @@
\exp_after:wN \__peek_N_type:w
\token_to_meaning:N \l_peek_token
\q_mark \__peek_N_type_aux:nnw
- OUTER \q_mark \use_none_delimit_by_q_stop:w
+ #1 \q_mark \use_none_delimit_by_q_stop:w
\q_stop
\exp_after:wN \__peek_true:w
\else:
\exp_after:wN \__peek_false:w
\fi:
}
- \cs_new_protected:Npn \__peek_N_type:w #1 OUTER #2 \q_mark #3
- { #3 {#1} {#2} }
+ \cs_new_protected:Npn \__peek_N_type:w ##1 #1 ##2 \q_mark ##3
+ { ##3 {##1} {##2} }
}
+ \exp_after:wN \__peek_tmp:w \tl_to_str:n { outer } \q_stop
\group_end:
\cs_new_protected:Npn \__peek_N_type_aux:nnw #1 #2 #3 \fi:
{
@@ -18807,12 +19031,6 @@
{ \__peek_token_generic:NNT \__peek_execute_branches_N_type: \scan_stop: }
\cs_new_protected_nopar:Npn \peek_N_type:F
{ \__peek_token_generic:NNF \__peek_execute_branches_N_type: \scan_stop: }
-\cs_new_protected:Npn \fp_set_from_dim:Nn #1#2
- { \fp_set:Nn #1 { \dim_to_fp:n {#2} } }
-\cs_new_protected:Npn \fp_gset_from_dim:Nn #1#2
- { \fp_gset:Nn #1 { \dim_to_fp:n {#2} } }
-\cs_generate_variant:Nn \fp_set_from_dim:Nn { c }
-\cs_generate_variant:Nn \fp_gset_from_dim:Nn { c }
%% File: l3sys.dtx Copyright (C) 2015 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
@@ -18845,8 +19063,16 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id$
+\GetIdInfo$Id: l3sys.dtx 6087 2015-09-25 10:29:53Z joseph $
{L3 Experimental system/runtime functions}
+\str_const:Nx \c_sys_jobname_str { \tex_jobname:D }
+\int_const:Nn \c_sys_minute_int
+ { \int_mod:nn { \tex_time:D } { 60 } }
+\int_const:Nn \c_sys_hour_int
+ { \int_div_truncate:nn { \tex_time:D } { 60 } }
+\int_const:Nn \c_sys_day_int { \tex_day:D }
+\int_const:Nn \c_sys_month_int { \tex_month:D }
+\int_const:Nn \c_sys_year_int { \tex_year:D }
\clist_map_inline:nn { lua , pdf , p , up , xe }
{
\cs_new_eq:cN { sys_if_engine_ #1 tex:T } \use_none:n
@@ -18860,6 +19086,7 @@
\cs_gset_eq:NN \sys_if_engine_luatex:F \use_none:n
\cs_gset_eq:NN \sys_if_engine_luatex:TF \use_i:nn
\cs_gset_eq:NN \sys_if_engine_luatex_p: \c_true_bool
+ \str_const:Nn \c_sys_engine_str { luatex }
}
\cs_if_exist:NT \pdftex_pdftexversion:D
{
@@ -18867,6 +19094,7 @@
\cs_gset_eq:NN \sys_if_engine_pdftex:F \use_none:n
\cs_gset_eq:NN \sys_if_engine_pdftex:TF \use_i:nn
\cs_gset_eq:NN \sys_if_engine_pdftex_p: \c_true_bool
+ \str_const:Nn \c_sys_engine_str { pdftex }
}
\cs_if_exist:NT \ptex_kanjiskip:D
{
@@ -18880,12 +19108,14 @@
\cs_gset_eq:NN \sys_if_engine_uptex:F \use_none:n
\cs_gset_eq:NN \sys_if_engine_uptex:TF \use_i:nn
\cs_gset_eq:NN \sys_if_engine_uptex_p: \c_true_bool
+ \str_const:Nn \c_sys_engine_str { uptex }
}
{
\cs_gset_eq:NN \sys_if_engine_ptex:T \use:n
\cs_gset_eq:NN \sys_if_engine_ptex:F \use_none:n
\cs_gset_eq:NN \sys_if_engine_ptex:TF \use_i:nn
\cs_gset_eq:NN \sys_if_engine_ptex_p: \c_true_bool
+ \str_const:Nn \c_sys_engine_str { ptex }
}
}
\cs_if_exist:NT \xetex_XeTeXversion:D
@@ -18894,6 +19124,34 @@
\cs_gset_eq:NN \sys_if_engine_xetex:F \use_none:n
\cs_gset_eq:NN \sys_if_engine_xetex:TF \use_i:nn
\cs_gset_eq:NN \sys_if_engine_xetex_p: \c_true_bool
+ \str_const:Nn \c_sys_engine_str { xetex }
+ }
+\bool_if:nTF
+ {
+ \cs_if_exist_p:N \pdftex_pdfoutput:D
+ && \int_compare_p:nNn \pdftex_pdfoutput:D > \c_zero
+ }
+ {
+ \cs_new_eq:NN \sys_if_output_dvi:T \use_none:n
+ \cs_new_eq:NN \sys_if_output_dvi:F \use:n
+ \cs_new_eq:NN \sys_if_output_dvi:TF \use_ii:nn
+ \cs_new_eq:NN \sys_if_output_dvi_p: \c_false_bool
+ \cs_new_eq:NN \sys_if_output_pdf:T \use:n
+ \cs_new_eq:NN \sys_if_output_pdf:F \use_none:n
+ \cs_new_eq:NN \sys_if_output_pdf:TF \use_i:nn
+ \cs_new_eq:NN \sys_if_output_pdf_p: \c_true_bool
+ \str_const:Nn \c_sys_output_str { pdf }
+ }
+ {
+ \cs_new_eq:NN \sys_if_output_dvi:T \use:n
+ \cs_new_eq:NN \sys_if_output_dvi:F \use_none:n
+ \cs_new_eq:NN \sys_if_output_dvi:TF \use_i:nn
+ \cs_new_eq:NN \sys_if_output_dvi_p: \c_true_bool
+ \cs_new_eq:NN \sys_if_output_pdf:T \use_none:n
+ \cs_new_eq:NN \sys_if_output_pdf:F \use:n
+ \cs_new_eq:NN \sys_if_output_pdf:TF \use_ii:nn
+ \cs_new_eq:NN \sys_if_output_pdf_p: \c_false_bool
+ \str_const:Nn \c_sys_output_str { dvi }
}
\prg_new_eq_conditional:NNn \luatex_if_engine: \sys_if_engine_luatex:
{ T , F , TF , p }
@@ -18916,6 +19174,7 @@
\cs_new_eq:NN \pdftex_if_engine:TF \use_i:nn
\cs_new_eq:NN \pdftex_if_engine_p: \c_true_bool
}
+\cs_set_eq:NN \c_job_name_tl \c_sys_jobname_str
%% File: l3luatex.dtx Copyright (C) 2010-2015 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index b06f37d4c6d..8941b300707 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/09/11}
-\def\ExplFileVersion{6002}
+\def\ExplFileDate{2015/09/27}
+\def\ExplFileVersion{6111}
\let\ExplLoaderFileVersion\ExplFileVersion
\begingroup
\def\tempa{LaTeX2e}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index acd8aaf809f..b0bdf9bc21c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -47,8 +47,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/09/11}
-\def\ExplFileVersion{6002}
+\def\ExplFileDate{2015/09/27}
+\def\ExplFileVersion{6111}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
@@ -112,21 +112,6 @@
active~engine.~LaTeX3~will~use~the~'#2'~driver~instead.
}
\tl_new:N \l__expl_driver_tl
-\bool_if:nTF
- {
- \cs_if_exist_p:N \pdftex_pdfoutput:D
- && \int_compare_p:nNn \pdftex_pdfoutput:D > \c_zero
- }
- {
- \cs_new_eq:NN \__expl_if_pdf:T \use:n
- \cs_new_eq:NN \__expl_if_pdf:F \use_none:n
- \cs_new_eq:NN \__expl_if_pdf:TF \use_i:nn
- }
- {
- \cs_new_eq:NN \__expl_if_pdf:T \use_none:n
- \cs_new_eq:NN \__expl_if_pdf:F \use:n
- \cs_new_eq:NN \__expl_if_pdf:TF \use_ii:nn
- }
\keys_define:nn { expl }
{
driver .choice:,
@@ -137,7 +122,7 @@
\sys_if_engine_xetex:TF
{ xdvipdfmx }
{
- \__expl_if_pdf:TF
+ \sys_if_output_pdf:TF
{ pdfmode }
{
\bool_if:nTF
@@ -161,7 +146,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:T
+ \sys_if_output_pdf:T
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvipdfmx } { pdfmode }
@@ -179,7 +164,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:T
+ \sys_if_output_pdf:T
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ dvips } { pdfmode }
@@ -199,7 +184,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
}
{
- \__expl_if_pdf:F
+ \sys_if_output_pdf:F
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ pdfmode } { dvips }
@@ -212,7 +197,7 @@
\tl_set:Nn \l__expl_driver_tl { xdvipdfmx }
\sys_if_engine_xetex:F
{
- \__expl_if_pdf:TF
+ \sys_if_output_pdf:TF
{
\__msg_kernel_error:nnnn { expl } { wrong-driver }
{ xdvipdfmx } { pdfmode }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index c06eb9cbee2..ed1d01cec9d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -50,7 +50,7 @@
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 5983 2015-09-10 18:57:56Z joseph $
+\GetIdInfo$Id: l3doc.dtx 6037 2015-09-23 12:41:15Z joseph $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1416,7 +1416,7 @@
\char_set_lccode:nn { `\^^B } { `\\ }
\char_set_lccode:nn { `\^^L } { `\{ }
\char_set_lccode:nn { `\^^R } { `\} }
- \tl_to_lowercase:n
+ \tex_lowercase:D
{
\group_end:
\cs_set_protected:Npn \xmacro@code
@@ -1461,7 +1461,7 @@
{ \g__codedoc_typeset_implementation_bool && \g__codedoc_checkfunc_bool }
{
\iow_term:x { \c__codedoc_iow_separator_tl \iow_newline: }
- \iow_open:Nn \g__codedoc_func_iow { \c_job_name_tl .cmds }
+ \iow_open:Nn \g__codedoc_func_iow { \c_sys_jobname_str .cmds }
\tl_clear:N \l__codedoc_doc_def_tl
\tl_clear:N \l__codedoc_doc_undef_tl
@@ -1600,7 +1600,7 @@
{
Generate~the~index~by~executing\\
\iow_indent:n
- { makeindex~-s~gind.ist~-o~\c_job_name_tl.ind~\c_job_name_tl.idx }
+ { makeindex~-s~gind.ist~-o~\c_sys_jobname_str.ind~\c_sys_jobname_str.idx }
}
\tl_gput_right:Nn \PrintIndex
{ \AtEndDocument { \msg_info:nn { l3doc } { print-index-howto } } }
@@ -1766,7 +1766,7 @@
{
Generate~the~change~list~by~executing\\
\iow_indent:n
- { makeindex~-s~gglo.ist~-o~\c_job_name_tl.gls~\c_job_name_tl.glo }
+ { makeindex~-s~gglo.ist~-o~\c_sys_jobname_str.gls~\c_sys_jobname_str.glo }
}
\tl_gput_right:Nn \PrintChanges
{ \AtEndDocument { \msg_info:nn { l3doc } { print-changes-howto } } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
new file mode 100644
index 00000000000..c14980cd4e7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
@@ -0,0 +1,76 @@
+%%
+%% This is file `l3str.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3oldmodules.dtx (with options: `l3str,oldmodules')
+%%
+%% EXPERIMENTAL CODE
+%%
+%% Do not distribute this file without also distributing the
+%% source files specified above.
+%%
+%% Do not distribute a modified version of this file.
+%%
+%% File: l3oldmodules.dtx Copyright (C) 2014 The LaTeX3 Project
+%%
+%% It may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License (LPPL), either version 1.3c of this
+%% license or (at your option) any later version. The latest version
+%% of this license is in the file
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% The released version of this bundle is available from CTAN.
+%%
+%% -----------------------------------------------------------------------
+%%
+%% The development version of the bundle can be found at
+%%
+%% http://www.latex-project.org/svnroot/experimental/trunk/
+%%
+%% for those people who are interested.
+%%
+%%%%%%%%%%%
+%% NOTE: %%
+%%%%%%%%%%%
+%%
+%% Snapshots taken from the repository represent work in progress and may
+%% not work or may contain conflicting material! We therefore ask
+%% people _not_ to put them into distributions, archives, etc. without
+%% prior consultation with the LaTeX3 Project.
+%%
+%% -----------------------------------------------------------------------
+\def\ExplFileDate{2014/09/06}
+
+\def\old@liii@module@name
+{l3str}
+\ProvidesPackage\old@liii@module@name
+ [%
+ \ExplFileDate\space v-no-info
+ Obsolete L3 package
+ ]
+\typeout{*****************************************************************}
+\typeout{** }
+\typeout{** Package \old@liii@module@name\space is obsolete and has been removed!}
+\typeout{** }
+\typeout{** Its functionality is now only provided as part of in the expl3 package}
+\typeout{** }
+\typeout{** After showing you an error message you can hit <return> we will continue}
+\typeout{** for now by loading expl3 for you. However, at some point in the future}
+\typeout{** the old packages will be removed.}
+\typeout{** }
+\typeout{** Therefore, please replace '\string\usepackage{\old@liii@module@name}'}
+\typeout{** with '\string\usepackage{expl3}' in your documents as soon as possible.}
+\typeout{** }
+\typeout{*******************************************************************}
+\PackageError\old@liii@module@name{This package is obsolete ---
+ use 'expl3' instead}\@ehc
+\RequirePackage{expl3}
+%%
+%%
+%% End of file `l3str.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 9dffe8d39d6..d53c1b29014 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3keys2e.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 6111 2015-09-27 16:06:17Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 9c1441858b5..c16f725c5f8 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -63,19 +63,12 @@
}%
\endinput
}
-\GetIdInfo$Id: xparse.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: xparse.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental document command parser}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\group_begin:
-\char_set_lccode:nn { `\Q } { `\- }
-\char_set_lccode:nn { `\N } { `\N }
-\char_set_lccode:nn { `\V } { `\V }
-\tl_to_lowercase:n
- {
- \group_end:
- \tl_const:Nn \c__xparse_no_value_tl { QNoValue- }
- }
+\tl_const:Nx \c__xparse_no_value_tl
+ { \char_generate:nn { `\- } { 11 } NoValue- }
\prop_new:N \c__xparse_shorthands_prop
\prop_put:Nnn \c__xparse_shorthands_prop { o } { d[] }
\prop_put:Nnn \c__xparse_shorthands_prop { O } { D[] }
@@ -683,24 +676,20 @@
#3 \l__xparse_args_tl
}
}
- \group_begin:
- \token_if_eq_catcode:NNTF #1 ^
- {
+ \token_if_eq_catcode:NNTF + #1
+ {
+ \group_begin:
\char_set_lccode:nn { `A } { `#1 }
- \tl_to_lowercase:n
+ \tex_lowercase:D
{
\group_end:
\l__xparse_fn_tl A
}
- }
- {
- \char_set_lccode:nn { `^ } { `#1 }
- \tl_to_lowercase:n
- {
- \group_end:
- \l__xparse_fn_tl ^
- }
- }
+ }
+ {
+ \exp_after:wN \l__xparse_fn_tl
+ \token_to_str:N #1
+ }
}
}
\tl_new:N \l__xparse_nesting_a_tl
@@ -1061,7 +1050,7 @@
\__xparse_add_arg:o \c__xparse_no_value_tl
\group_begin:
\char_set_lccode:nn { `\# } { \tex_endlinechar:D }
- \tl_to_lowercase:n
+ \tex_lowercase:D
{ \group_end: \peek_meaning_remove:NTF ## }
{
\__msg_kernel_error:nnxxx { xparse } { verbatim-newline }
@@ -1278,12 +1267,12 @@
\tl_set:Nn \l__xparse_split_list_tl {#2}
\group_begin:
\char_set_lccode:nn { `\@ } { `#1 }
- \tl_to_lowercase:n
+ \tex_lowercase:D
{
- \group_end:
- \tl_replace_all:Nnn \l__xparse_split_list_tl { @ } {#1}
- }
- \__xparse_split_list_multi:nV {#1} \l__xparse_split_list_tl
+ \group_end:
+ \tl_replace_all:Nnn \l__xparse_split_list_tl { @ }
+ } {#1}
+ \__xparse_split_list_multi:nV {#1} \l__xparse_split_list_tl
}
\group_end:
\cs_new_protected:Npn \__xparse_split_argument:nnn #1#2#3
@@ -1370,24 +1359,22 @@
{ \tl_to_str:n {#1} }
}
}
-\group_begin:
-\char_set_lccode:nn { `\Q } { `\- }
-\char_set_lccode:nn { `\F } { `\F }
-\char_set_lccode:nn { `\N } { `\N }
-\char_set_lccode:nn { `\T } { `\T }
-\char_set_lccode:nn { `\V } { `\V }
-\tl_to_lowercase:n
- {
- \group_end:
- \prg_new_conditional:Npnn \__xparse_if_no_value:n #1 { T , F , TF }
- {
- \str_if_eq:onTF
- { \__xparse_if_value_aux:w ? #1 { } QNoValue- }
- { ? { } QNoValue- }
- { \prg_return_true: }
- { \prg_return_false: }
- }
- \cs_new:Npn \__xparse_if_value_aux:w #1 QNoValue- { #1 }
+\use:x
+ {
+ \prg_new_conditional:Npnn \exp_not:N \__xparse_if_no_value:n ##1
+ { T , F , TF }
+ {
+ \exp_not:N \str_if_eq:onTF
+ {
+ \exp_not:N \__xparse_if_value_aux:w ? ##1 { }
+ \c__xparse_no_value_tl
+ }
+ { ? { } \c__xparse_no_value_tl }
+ { \exp_not:N \prg_return_true: }
+ { \exp_not:N \prg_return_false: }
+ }
+ \cs_new:Npn \exp_not:N \__xparse_if_value_aux:w ##1 \c__xparse_no_value_tl
+ { ##1 }
}
\__msg_kernel_new:nnnn { xparse } { bad-arg-spec }
{ Bad~argument~specification~'#1'. }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index c761e58bb88..2008933ab74 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
-\@ifpackagelater{expl3}{2015/09/11}
+\RequirePackage{expl3}[2015/09/27]
+\@ifpackagelater{expl3}{2015/09/27}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 6001 2015-09-11 21:50:23Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 6111 2015-09-27 16:06:17Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}