summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua128
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty16
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty16
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty16
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty16
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex1027
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls2883
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def548
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty88
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty6
21 files changed, 2791 insertions, 2037 deletions
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 02a6f8c066c..9e6bd7d8c59 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -17,20 +17,43 @@
--]]
-- Version information: should be identical to that in l3build.dtx
-release_date = "2014/07/19"
-release_ver = "5240"
+release_date = "2014/08/25"
+release_ver = "5378"
+
+-- "module" is a deprecated function in Lua 5.2: as we want the name
+-- for other purposes, and it should eventually be 'free', simply
+-- remove the built-in
+if type (module) == "function" then
+ module = nil
+end
-- Ensure the module and bundle exist
module = module or ""
bundle = bundle or ""
+-- Sanity check
+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"
+ )
+ else
+ print (
+ "\n" ..
+ "Error: Specify either bundle or module in configuration script.\n"
+ )
+ end
+ os.exit (1)
+end
+
-- Directory structure for the build system
-- Use Unix-style path separators
maindir = maindir or "."
-- Substructure for tests and support files
testfiledir = testfiledir or "testfiles" -- Set to "" to cancel any tests
-testsupdir = testsupdir or testfiledir .. "/support"
+testsuppdir = testsuppdir or testfiledir .. "/support"
supportdir = supportdir or maindir .. "/support"
-- Structure within a development area
@@ -64,7 +87,7 @@ cleanfiles = cleanfiles or {"*.pdf", "*.zip"}
excludefiles = excludefiles or {"*~"} -- Any Emacs stuff
installfiles = installfiles or {"*.sty"}
sourcefiles = sourcefiles or {"*.dtx", "*.ins"} -- Files to copy for unpacking
-txtfiles = txtfiles or {"*.markdown"}
+txtfiles = txtfiles or {"*.md", "*.markdown"}
typesetfiles = typesetfiles or {"*.dtx"}
typesetsuppfiles = typesetsuppfiles or { }
unpackfiles = unpackfiles or {"*.ins"} -- Files to actually unpack
@@ -378,9 +401,9 @@ function checkinit ()
for _,i in ipairs (checkfiles) do
cp (i, unpackdir, testdir)
end
- if direxists (testsupdir) then
- for _,i in ipairs (filelist (testsupdir)) do
- cp (i, testsupdir, testdir)
+ if direxists (testsuppdir) then
+ for _,i in ipairs (filelist (testsuppdir)) do
+ cp (i, testsuppdir, testdir)
end
end
for _,i in ipairs (checksuppfiles) do
@@ -441,6 +464,10 @@ function formatlog (logfile, newfile)
line = string.gsub (line, string.match (logfile, ".*/(.*)%" .. logext .. "$"), "")
-- Zap ./ at begin of filename
line = string.gsub (line, "%(%.%/", "(")
+ -- Zap paths if places other than 'here' are accessible
+ if checksearch then
+ line = string.gsub (line, "%(.*/([%w-]+%.[%w-]+)%s*$", "(../%1")
+ end
-- 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"
@@ -463,6 +490,12 @@ function formatlog (logfile, newfile)
for i = 1, 31, 1 do
line = string.gsub (line, string.char (i), "^^" .. string.char (64 + i))
end
+ -- Minor LuaTeX difference: it does not include parentheses in one message
+ line = string.gsub (
+ line,
+ "%(If you're confused by all this, try typing `I}' now%.%)",
+ "If you're confused by all this, try typing `I}' now."
+ )
-- Minor LuaTeX bug: it prints an extra "'" in one message: add enough
-- context to hopefully hit only the bug
line = string.gsub (
@@ -524,6 +557,7 @@ function runcheck (name, engine, hide)
end
local errorlevel = 0
for _,i in ipairs (checkengines) do
+ cp (name .. tlgext, testfiledir, testdir)
runtest (name, i, hide)
local testname = name .. "." .. i
local difffile = testdir .. "/" .. testname .. os_diffext
@@ -593,30 +627,40 @@ end
help = help or function ()
print ""
if testfiledir ~= "" then
- print " build check - run automated check system "
+ print " build check - run all automated tests for all engines"
end
if module ~= "" and testfiledir ~= "" then
- print " build checklvt <name> - check one test file <name> for all engines"
- print " build checklvt <name> <engine> - check one test file <name> for <engine> "
+ print " build check <name> - check one test file <name> for all engines"
+ print " build check <name> <engine> - check one test file <name> for <engine> "
end
- print " build clean - clean out directory tree "
+ print " build clean - clean out directory tree "
if next (cmdchkfiles) ~= nil then
- print " build cmdcheck - check commands documented are defined "
+ print " build cmdcheck - check commands documented are defined "
end
if module == "" or bundle == "" then
- print " build ctan - create CTAN-ready archive "
+ print " build ctan - create CTAN-ready archive "
end
- print " build doc - runs all documentation files "
- print " build install - install files in local texmf tree "
+ print " build doc - runs all documentation files "
+ print " build install - install files in local texmf tree "
if module ~= "" and testfiledir ~= "" then
- print " build savetlg <name> - save test log for <name> for all engines "
- print " build savetlg <name> <engine> - save test log for <name> for <engine> "
+ print " build save <name> - save test log for <name> for all engines "
+ print " build save <name> <engine> - save test log for <name> for <engine> "
end
- print " build unpack - extract packages "
+ print " build unpack - extract packages "
print ""
end
-function check ()
+function check (name, engine)
+ local errorlevel = 0
+ if name then
+ errorlevel = checklvt (name, engine)
+ else
+ errorlevel = checkall ()
+ end
+ return (errorlevel)
+end
+
+function checkall ()
local errorlevel = 0
if testfiledir ~= "" and direxists (testfiledir) then
checkinit ()
@@ -630,11 +674,7 @@ function check ()
end
end
if errorlevel ~= 0 then
- print ("\n Check failed with difference files")
- for _,i in ipairs (filelist (testdir, "*" .. os_diffext)) do
- print (" - " .. testdir .. "/" .. i)
- end
- print ("")
+ checkdiff ()
else
print ("\n All checks passed\n")
end
@@ -643,23 +683,33 @@ function check ()
end
function checklvt (name, engine)
- local engine = engine or stdengine
if testexists (name) then
checkinit ()
print ("Running checks on " .. name)
- runcheck (name, engine)
- if fileexists (testdir .. "/" .. name .. "." .. engine .. os_diffext) then
- print (" Check fails with diff file")
- print (
- " " .. testdir .. "/" .. name .. "." .. engine .. os_diffext)
+ local errorlevel = runcheck (name, engine)
+ if errorlevel ~= 0 then
+ checkdiff ()
else
- print (" Check passes")
+ if engine then
+ print (" Check passes")
+ else
+ print ("\n All checks passed\n")
+ end
end
else
print ("Test \"" .. name .. "\" not set up!")
end
end
+-- A short auxiliary to print the list of differences for check
+function checkdiff ()
+ print ("\n Check failed with difference files")
+ for _,i in ipairs (filelist (testdir, "*" .. os_diffext)) do
+ print (" - " .. testdir .. "/" .. i)
+ end
+ print ("")
+end
+
-- Remove all generated files
function clean ()
-- To make sure that distribdir never contains any stray subdirs,
@@ -745,7 +795,9 @@ function ctan (standalone)
errorlevel = allmodules ("bundlecheck")
end
if errorlevel == 0 then
+ rmdir (ctandir)
mkdir (ctandir .. "/" .. bundle)
+ rmdir (tdsdir)
mkdir (tdsdir)
if standalone then
errorlevel = bundlectan ()
@@ -892,7 +944,7 @@ function install ()
end
end
-function savetlg (name, engine)
+function save (name, engine)
local tlgfile = name .. (engine and ("." .. engine) or "") .. tlgext
local newfile = name .. "." .. (engine or stdengine) .. logext
if fileexists (testfiledir .. "/" .. name .. lvtext) then
@@ -999,13 +1051,7 @@ function stdmain (target, file, engine)
elseif target == "doc" then
doc ()
elseif target == "check" and testfiledir ~= "" then
- check ()
- elseif target == "checklvt" and testfiledir ~= "" then
- if file then
- checklvt (file, engine)
- else
- help ()
- end
+ check (file, engine)
elseif target == "clean" then
clean ()
elseif target == "cmdcheck" and next (cmdchkfiles) ~= nil then
@@ -1014,9 +1060,9 @@ function stdmain (target, file, engine)
ctan (true)
elseif target == "install" then
install ()
- elseif target == "savetlg" and testfiledir ~= "" then
+ elseif target == "save" and testfiledir ~= "" then
if file then
- savetlg (file, engine)
+ save (file, engine)
else
help ()
end
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index cffbfc4bcc1..3f781de5dfc 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File l3sort.dtx (C) Copyright 2012 The LaTeX3 Project
+%% File l3sort.dtx (C) Copyright 2012,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
@@ -46,8 +46,20 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3sort.dtx 4623 2013-12-14 13:53:40Z bruno $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3sort}{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 l3sort will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3sort.dtx 5378 2014-08-25 10:59:48Z 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 242a465ed60..263f313e488 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3flag.dtx Copyright (C) 2011-2012 The LaTeX3 Project
+%% File: l3flag.dtx Copyright (C) 2011-2012,2104 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
@@ -45,8 +45,20 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3flag.dtx 4745 2014-05-06 10:41:27Z joseph $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3flag}{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 l3flag will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3flag.dtx 5378 2014-08-25 10:59:48Z 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 2fb5cfe9b27..3ea9923985f 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,20 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 5218 2014-07-17 14:23:10Z bruno $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3regex}{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 l3regex will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3regex.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index c66adca5c64..980335eefd3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,20 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 5218 2014-07-17 14:23:10Z bruno $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3regex}{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 l3regex will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3regex.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
index 70ef981eba3..b5b5048082f 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
@@ -45,10 +45,22 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3str-expl.dtx 5226 2014-07-18 18:08:01Z joseph $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \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 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental strings}
-\def\ExplSyntaxName{l3str}
+\def\ExplFileName{l3str}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\cs_new_eq:NN \str_new:N \tl_new:N
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index e916eaa180e..c2f1b05c180 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -45,8 +45,20 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}
-\GetIdInfo$Id: l3tl-build.dtx 4745 2014-05-06 10:41:27Z joseph $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3tl-build}{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 l3tl-build will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3tl-build.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental token list construction}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 25e080d20df..5af9a52a3c0 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,20 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{xparse}
-\GetIdInfo$Id: l3galley.dtx 4728 2014-05-04 13:25:37Z joseph $
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
+ {}
+ {%
+ \PackageError{l3galley}{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 l3galley will abort!%
+ }%
+ \endinput
+ }
+\GetIdInfo$Id: l3galley.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index 93bbff8537b..96d7bf29a06 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}
-\GetIdInfo$Id: xgalley.dtx 4728 2014-05-04 13:25:37Z joseph $
+\RequirePackage{xparse}
+\GetIdInfo$Id: xgalley.dtx 5375 2014-08-25 10:17:29Z joseph $
{L3 Experimental galley}
\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 7261f07da3b..6e360dc8537 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -80,8 +80,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2014/07/20}
-\def\ExplFileVersion{5241}
+\def\ExplFileDate{2014/08/25}
+\def\ExplFileVersion{5378}
\begingroup
\def\next{\endgroup}
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -190,7 +190,7 @@
\def\ExplFileDescription{#2}%
\def\ExplFileName{[unknown name]}%
\def\ExplFileExtension{[unknown extension]}%
- \def\ExplFileDate{-1}%
+ \def\ExplFileVersion{-1}%
}%
\else
\def\tempa
@@ -240,7 +240,7 @@
}
}
\endgroup
-\GetIdInfo$Id: l3bootstrap.dtx 4889 2014-05-26 19:59:25Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Bootstrap code}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfstrcmp\endcsname\relax
@@ -301,16 +301,15 @@
\expandafter\ifx\csname directlua\endcsname\relax
\else
\ifnum\luatexversion<36 %
+ \newlinechar`\^^J\relax
\def\LineBreak{\noexpand\MessageBreak}%
\expandafter\ifx\csname PackageError\endcsname\relax
\def\LineBreak{^^J}%
- \begingroup
- \def\PackageError#1#2#3%
- {%
- \endgroup
- \errhelp{#3}%
- \errmessage{#1 Error: #2!}
- }%
+ \def\PackageError#1#2#3%
+ {%
+ \errhelp{#3}%
+ \errmessage{#1 Error: #2!}
+ }%
\fi
\edef\next
{%
@@ -426,7 +425,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3names.dtx 4993 2014-06-02 09:39:35Z joseph $
+\GetIdInfo$Id: l3names.dtx 5343 2014-08-22 19:32:35Z bruno $
{L3 Namespace for primitives}
\let \tex_global:D \global
\let \tex_let:D \let
@@ -883,16 +882,17 @@
\tex_let:D \luatex_textdir:D \luatextextdir
\tex_fi:D
\etex_ifdefined:D \normalend
- \tex_let:D \tex_outer:D \normalouter
- \tex_let:D \tex_input:D \normalinput
\tex_let:D \tex_end:D \normalend
+ \tex_let:D \tex_everyjob:D \normaleveryjob
+ \tex_let:D \tex_input:D \normalinput
\tex_let:D \tex_language:D \normallanguage
- \tex_let:D \tex_vcenter:D \normalvcneter
- \tex_let:D \tex_over:D \normalover
\tex_let:D \tex_mathop:D \normalmathop
\tex_let:D \tex_month:D \normalmonth
- \tex_let:D \tex_everyjob:D \normaleveryjob
+ \tex_let:D \tex_outer:D \normalouter
+ \tex_let:D \tex_over:D \normalover
+ \tex_let:D \tex_vcenter:D \normalvcenter
\tex_let:D \etex_unexpanded:D \normalunexpanded
+ \tex_let:D \luatex_expanded:D \normalexpanded
\tex_fi:D
\etex_ifdefined:D \normalitaliccorrection
\tex_let:D \tex_hoffset:D \normalhoffset
@@ -939,7 +939,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3basics.dtx 5187 2014-07-09 12:02:17Z will $
+\GetIdInfo$Id: l3basics.dtx 5364 2014-08-24 20:19:24Z joseph $
{L3 Basic definitions}
\tex_let:D \if_true: \tex_iftrue:D
\tex_let:D \if_false: \tex_iffalse:D
@@ -990,9 +990,6 @@
\tex_let:D \c_minus_one \m@ne
\tex_chardef:D \c_sixteen = 16 ~
\tex_chardef:D \c_zero = 0 ~
-\tex_chardef:D \c_six = 6 ~
-\tex_chardef:D \c_seven = 7 ~
-\tex_chardef:D \c_twelve = 12 ~
\etex_ifdefined:D \luatex_luatexversion:D
\tex_chardef:D \c_max_register_int = 65 535 ~
\tex_else:D
@@ -1136,7 +1133,8 @@
{#1} {#2} {#3} {#4} {#5} {#6}
\__prg_generate_conditional:nnnnnnw {#1} {#2} {#3} {#4} {#5} {#6}
}
-\cs_set_protected:Npn \__prg_generate_p_form:wnnnnnn #1 \q_stop #2#3#4#5#6#7
+\cs_set_protected:Npn \__prg_generate_p_form:wnnnnnn
+ #1 \q_stop #2#3#4#5#6#7
{
\if_meaning:w \scan_stop: #3 \scan_stop:
\exp_after:wN \use_i:nn
@@ -1152,17 +1150,20 @@
{ \token_to_str:c { #4 _p: #5 } }
}
}
-\cs_set_protected:Npn \__prg_generate_T_form:wnnnnnn #1 \q_stop #2#3#4#5#6#7
+\cs_set_protected:Npn \__prg_generate_T_form:wnnnnnn
+ #1 \q_stop #2#3#4#5#6#7
{
\exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 T } #6
{ #7 \c_zero \use:n \use_none:n }
}
-\cs_set_protected:Npn \__prg_generate_F_form:wnnnnnn #1 \q_stop #2#3#4#5#6#7
+\cs_set_protected:Npn \__prg_generate_F_form:wnnnnnn
+ #1 \q_stop #2#3#4#5#6#7
{
\exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 F } #6
{ #7 \c_zero { } }
}
-\cs_set_protected:Npn \__prg_generate_TF_form:wnnnnnn #1 \q_stop #2#3#4#5#6#7
+\cs_set_protected:Npn \__prg_generate_TF_form:wnnnnnn
+ #1 \q_stop #2#3#4#5#6#7
{
\exp_args:cc { cs_ #2 #3 :Npn } { #4 : #5 TF } #6
{ #7 \c_zero }
@@ -1346,6 +1347,7 @@
{ \tex_immediate:D \tex_write:D \c_sixteen }
\cs_set_protected:Npn \__msg_kernel_error:nnxx #1#2#3#4
{
+ \tex_newlinechar:D = `\^^J \tex_relax:D
\tex_errmessage:D
{
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!~! ^^J
@@ -1734,7 +1736,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3expan.dtx 5146 2014-06-16 13:12:18Z joseph $
+\GetIdInfo$Id: l3expan.dtx 5349 2014-08-22 21:46:59Z bruno $
{L3 Argument expansion}
\cs_new:Npn \__exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } }
\cs_new:Npn \__exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } }
@@ -2210,7 +2212,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3tl.dtx 5214 2014-07-17 08:39:43Z joseph $
+\GetIdInfo$Id: l3tl.dtx 5359 2014-08-24 09:20:32Z bruno $
{L3 Token lists}
\cs_new_protected:Npn \tl_new:N #1
{
@@ -2423,55 +2425,72 @@
\cs_new_protected:Npn \tl_to_uppercase:n #1
{ \tex_uppercase:D {#1} }
\cs_new_protected_nopar:Npn \tl_replace_once:Nnn
- { \__tl_replace:NNNnn \__tl_replace_once: \tl_set:Nx }
+ { \__tl_replace:NnNNNnn \q_mark ? \__tl_replace_wrap:w \tl_set:Nx }
\cs_new_protected_nopar:Npn \tl_greplace_once:Nnn
- { \__tl_replace:NNNnn \__tl_replace_once: \tl_gset:Nx }
+ { \__tl_replace:NnNNNnn \q_mark ? \__tl_replace_wrap:w \tl_gset:Nx }
\cs_new_protected_nopar:Npn \tl_replace_all:Nnn
- { \__tl_replace:NNNnn \__tl_replace_all: \tl_set:Nx }
+ { \__tl_replace:NnNNNnn \q_mark ? \__tl_replace_next:w \tl_set:Nx }
\cs_new_protected_nopar:Npn \tl_greplace_all:Nnn
- { \__tl_replace:NNNnn \__tl_replace_all: \tl_gset:Nx }
+ { \__tl_replace:NnNNNnn \q_mark ? \__tl_replace_next:w \tl_gset:Nx }
\cs_generate_variant:Nn \tl_replace_once:Nnn { c }
\cs_generate_variant:Nn \tl_greplace_once:Nnn { c }
\cs_generate_variant:Nn \tl_replace_all:Nnn { c }
\cs_generate_variant:Nn \tl_greplace_all:Nnn { c }
-\cs_new_protected:Npn \__tl_replace:NNNnn #1#2#3#4#5
+\cs_new_protected:Npn \__tl_replace:NnNNNnn #1#2#3#4#5#6#7
{
- \tl_if_empty:nTF {#4}
+ \tl_if_empty:nTF {#6}
{
- \__msg_kernel_error:nnx { kernel } { empty-search-pattern }
- { \tl_to_str:n {#5} }
+ \__msg_kernel_error:nnx { kernel } { empty-search-pattern }
+ { \tl_to_str:n {#7} }
}
{
- \group_align_safe_begin:
- \cs_set:Npx \__tl_tmp:w ##1##2 #4
- {
- ##2
- \exp_not:N \q_mark
- \exp_not:N \use_none_delimit_by_q_stop:w
- \exp_not:n { \exp_not:n {#5} }
- ##1
- }
- \group_align_safe_end:
- #2 #3
+ \tl_if_in:onTF { #5 #6 } {#1}
{
- \exp_after:wN #1
- #3 \q_mark #4 \q_stop
+ \tl_if_in:nnTF {#6} {#1}
+ { \exp_args:Nc \__tl_replace:NnNNNnn {#2} {#2?} }
+ {
+ \quark_if_nil:nTF {#6}
+ { \__tl_replace_auxi:NnnNNNnn #5 {#1} { #1 \q_stop } }
+ { \__tl_replace_auxi:NnnNNNnn #5 {#1} { #1 \q_nil } }
+ }
}
+ { \__tl_replace_auxii:nNNNnn {#1} }
+ #3#4#5 {#6} {#7}
}
}
-\cs_new:Npn \__tl_replace:w #1 \q_mark #2 { \exp_not:o {#1} }
-\cs_new_nopar:Npn \__tl_replace_all:
+\cs_new_protected:Npn \__tl_replace_auxi:NnnNNNnn #1#2#3
{
- \exp_after:wN \__tl_replace:w
- \__tl_tmp:w \__tl_replace_all: \prg_do_nothing:
+ \tl_if_in:NnTF #1 { #2 #3 #3 }
+ { \__tl_replace_auxi:NnnNNNnn #1 { #2 #3 } {#2} }
+ { \__tl_replace_auxii:nNNNnn { #2 #3 #3 } }
}
-\cs_new_nopar:Npn \__tl_replace_once:
+\cs_new_protected:Npn \__tl_replace_auxii:nNNNnn #1#2#3#4#5#6
{
- \exp_after:wN \__tl_replace:w
- \__tl_tmp:w { \__tl_replace_once_end:w \prg_do_nothing: } \prg_do_nothing:
+ \group_align_safe_begin:
+ \cs_set:Npn \__tl_replace_wrap:w ##1 #1 ##2 { \exp_not:o {##1} ##2 }
+ \cs_set:Npx \__tl_replace_next:w ##1 #5
+ {
+ \exp_not:N \__tl_replace_wrap:w ##1
+ \exp_not:n { #1 }
+ \exp_not:n { \exp_not:n {#6} }
+ \exp_not:n { #2 \prg_do_nothing: }
+ }
+ #3 #4
+ {
+ \exp_after:wN \__tl_replace_next:w
+ \exp_after:wN \prg_do_nothing: #4
+ #1
+ {
+ \if_false: { \fi: }
+ \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
+ }
+ #5
+ \q_recursion_stop
+ }
+ \group_align_safe_end:
}
-\cs_new:Npn \__tl_replace_once_end:w #1 \q_mark #2 \q_stop
- { \exp_not:o {#1} }
+\cs_new_eq:NN \__tl_replace_wrap:w ?
+\cs_new_eq:NN \__tl_replace_next:w ?
\cs_new_protected:Npn \tl_remove_once:Nn #1#2
{ \tl_replace_once:Nnn #1 {#2} { } }
\cs_new_protected:Npn \tl_gremove_once:Nn #1#2
@@ -2508,7 +2527,8 @@
\cs_generate_variant:Nn \tl_if_empty:NTF { c }
\prg_new_conditional:Npnn \tl_if_empty:n #1 { p , TF , T , F }
{
- \exp_after:wN \if_meaning:w \exp_after:wN \q_nil \tl_to_str:n {#1} \q_nil
+ \exp_after:wN \if_meaning:w \exp_after:wN \q_nil
+ \tl_to_str:n {#1} \q_nil
\prg_return_true:
\else:
\prg_return_false:
@@ -2564,9 +2584,11 @@
\cs_generate_variant:Nn \tl_if_in:NnTF { c }
\prg_new_protected_conditional:Npnn \tl_if_in:nn #1#2 { T , F , TF }
{
+ \if_false: { \fi:
\cs_set:Npn \__tl_tmp:w ##1 #2 { }
\tl_if_empty:oTF { \__tl_tmp:w #1 {} {} #2 }
{ \prg_return_false: } { \prg_return_true: }
+ \if_false: } \fi:
}
\cs_generate_variant:Nn \tl_if_in:nnT { V , o , no }
\cs_generate_variant:Nn \tl_if_in:nnF { V , o , no }
@@ -2672,7 +2694,10 @@
\cs_new:Npn \tl_use:N #1
{
\tl_if_exist:NTF #1 {#1}
- { \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#1} }
+ {
+ \__msg_kernel_expandable_error:nnn
+ { kernel } { bad-variable } {#1}
+ }
}
\cs_generate_variant:Nn \tl_use:N { c }
\cs_new:Npn \tl_count:n #1
@@ -2828,7 +2853,10 @@
\if_false: { \fi: \__tl_head_auxi:nw #1 { } \q_stop }
}
\cs_new:Npn \__tl_head_auxi:nw #1#2 \q_stop
- { \exp_after:wN \__tl_head_auxii:n \exp_after:wN { \if_false: } \fi: {#1} }
+ {
+ \exp_after:wN \__tl_head_auxii:n \exp_after:wN {
+ \if_false: } \fi: {#1}
+ }
\cs_new:Npn \__tl_head_auxii:n #1
{
\exp_after:wN \if_meaning:w \exp_after:wN \q_nil
@@ -2927,20 +2955,27 @@
}
\prg_new_conditional:Npnn \tl_if_head_is_N_type:n #1 { p , T , F , TF }
{
- \__str_if_eq_x_return:nn
- { \exp_not:o { \use:n #1 { } } }
- { \exp_not:n { #1 { } } }
+ \if_catcode:w
+ \if_false: { \fi: \__tl_if_head_is_N_type:w ? #1 ~ }
+ \exp_after:wN \use_none:n
+ \exp_after:wN { \exp_after:wN { \token_to_str:N #1 ? } }
+ * *
+ \prg_return_true:
+ \else:
+ \prg_return_false:
+ \fi:
+ }
+\cs_new:Npn \__tl_if_head_is_N_type:w #1 ~
+ {
+ \tl_if_empty:oTF { \use_none:n #1 } { ^ } { }
+ \exp_after:wN \use_none:n \exp_after:wN { \if_false: } \fi:
}
\prg_new_conditional:Npnn \tl_if_head_is_group:n #1 { p , T , F , TF }
{
- \if_catcode:w *
+ \if_catcode:w
\exp_after:wN \use_none:n
- \exp_after:wN {
- \exp_after:wN {
- \token_to_str:N #1 ?
- }
- }
- *
+ \exp_after:wN { \exp_after:wN { \token_to_str:N #1 ? } }
+ * *
\prg_return_false:
\else:
\prg_return_true:
@@ -3032,7 +3067,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3str.dtx 5158 2014-06-19 08:05:56Z joseph $
+\GetIdInfo$Id: l3str.dtx 5368 2014-08-24 22:32:57Z bruno $
{L3 Strings}
\cs_new:Npn \str_head:n #1
{
@@ -3081,7 +3116,8 @@
}
\prg_new_conditional:Npnn \str_if_eq:nn #1#2 { p , T , F , TF }
{
- \if_int_compare:w \__str_if_eq_x:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
+ \if_int_compare:w
+ \__str_if_eq_x:nn { \exp_not:n {#1} } { \exp_not:n {#2} }
= \c_zero
\prg_return_true: \else: \prg_return_false: \fi:
}
@@ -3177,7 +3213,7 @@
\cs_new:Npn \__str_fold_auxiii:NNNNNNNN #1#2#3#4#5#6#7#8
{
\exp_args:NNv \str_case_x:nnF #8
- { c__str_fold_ #6 _ #7 _tl }
+ { c__str_fold_ #6 _X_ #7 _tl }
{
#8
\exp_after:wN \use_none:n #8
@@ -3220,7 +3256,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3seq.dtx 5232 2014-07-18 19:32:54Z joseph $
+\GetIdInfo$Id: l3seq.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Sequences and stacks}
\cs_new:Npn \__seq_item:n
{
@@ -3326,8 +3362,10 @@
{ \tl_gset:Nf #1 { \exp_after:wN \use_i:nn \exp_after:wN #2 #3 } }
\cs_generate_variant:Nn \seq_concat:NNN { ccc }
\cs_generate_variant:Nn \seq_gconcat:NNN { ccc }
-\prg_new_eq_conditional:NNn \seq_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \seq_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \seq_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \seq_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_protected:Npn \seq_put_left:Nn #1#2
{
\tl_set:Nx #1
@@ -3684,7 +3722,10 @@
\q_stop { }
}
}
- { \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#1} }
+ {
+ \__msg_kernel_expandable_error:nnn
+ { kernel } { bad-variable } {#1}
+ }
}
\cs_generate_variant:Nn \seq_use:Nnnn { c }
\cs_new:Npn \__seq_use:NNnNnn #1#2#3#4#5#6 { \exp_not:n { #3 #6 #5 } }
@@ -3775,14 +3816,15 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3int.dtx 5197 2014-07-11 06:42:47Z joseph $
+\GetIdInfo$Id: l3int.dtx 5372 2014-08-25 02:01:41Z bruno $
{L3 Integers}
\cs_new_eq:NN \__int_value:w \tex_number:D
\cs_new_eq:NN \__int_eval:w \etex_numexpr:D
\cs_new_eq:NN \__int_eval_end: \tex_relax:D
\cs_new_eq:NN \if_int_odd:w \tex_ifodd:D
\cs_new_eq:NN \if_case:w \tex_ifcase:D
-\cs_new:Npn \int_eval:n #1 { \__int_value:w \__int_eval:w #1 \__int_eval_end: }
+\cs_new:Npn \int_eval:n #1
+ { \__int_value:w \__int_eval:w #1 \__int_eval_end: }
\cs_new:Npn \int_abs:n #1
{
\__int_value:w \exp_after:wN \__int_abs:N
@@ -3899,8 +3941,10 @@
\cs_new_protected:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \int_gset_eq:NN { c }
\cs_generate_variant:Nn \int_gset_eq:NN { Nc , cc }
-\prg_new_eq_conditional:NNn \int_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \int_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \int_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \int_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_protected:Npn \int_add:Nn #1#2
{ \tex_advance:D #1 by \__int_eval:w #2 \__int_eval_end: }
\cs_new_protected:Npn \int_sub:Nn #1#2
@@ -4415,90 +4459,54 @@
\cs_new_nopar:Npn \__int_to_Roman_d:w { D }
\cs_new_nopar:Npn \__int_to_Roman_m:w { M }
\cs_new:Npn \__int_to_Roman_Q:w #1 { }
-\cs_new:Npn \__int_get_sign:n #1
- {
- \__int_get_sign_and_digits:nNNN {#1}
- \c_true_bool \c_true_bool \c_false_bool
- }
-\cs_new:Npn \__int_get_digits:n #1
- {
- \__int_get_sign_and_digits:nNNN {#1}
- \c_true_bool \c_false_bool \c_true_bool
- }
-\cs_new:Npn \__int_get_sign_and_digits:nNNN #1#2#3#4
+\cs_new:Npn \__int_pass_signs:wn #1
{
- \exp_args:Nf \tl_if_head_eq_charcode:nNTF {#1} -
- {
- \bool_if:NTF #2
- {
- \__int_get_sign_and_digits:oNNN
- { \use_none:n #1 } \c_false_bool #3#4
- }
- {
- \__int_get_sign_and_digits:oNNN
- { \use_none:n #1 } \c_true_bool #3#4
- }
- }
- {
- \exp_args:Nf \tl_if_head_eq_charcode:nNTF {#1} +
- { \__int_get_sign_and_digits:oNNN { \use_none:n #1 } #2#3#4 }
- {
- \bool_if:NT #3 { \bool_if:NF #2 - }
- \bool_if:NT #4 {#1}
- }
- }
+ \if:w + \if:w - \exp_not:N #1 + \fi: \exp_not:N #1
+ \exp_after:wN \__int_pass_signs:wn
+ \else:
+ \exp_after:wN \__int_pass_signs_end:wn
+ \exp_after:wN #1
+ \fi:
}
-\cs_generate_variant:Nn \__int_get_sign_and_digits:nNNN { o }
+\cs_new:Npn \__int_pass_signs_end:wn #1 \q_stop #2 { #2 #1 }
\cs_new:Npn \int_from_alph:n #1
{
\int_eval:n
{
- \__int_get_sign:n {#1}
- \exp_args:Nf \__int_from_alph:n { \__int_get_digits:n {#1} }
+ \__int_pass_signs:wn #1
+ \q_stop { \__int_from_alph:nN { 0 } }
+ \q_recursion_tail \q_recursion_stop
}
}
-\cs_new:Npn \__int_from_alph:n #1
- { \__int_from_alph:nN { 0 } #1 \q_nil }
\cs_new:Npn \__int_from_alph:nN #1#2
{
- \quark_if_nil:NTF #2
- {#1}
- {
- \exp_args:Nf \__int_from_alph:nN
- { \int_eval:n { #1 * 26 + \__int_from_alph:N #2 } }
- }
+ \quark_if_recursion_tail_stop_do:Nn #2 {#1}
+ \exp_args:Nf \__int_from_alph:nN
+ { \int_eval:n { #1 * 26 + \__int_from_alph:N #2 } }
}
\cs_new:Npn \__int_from_alph:N #1
- { \int_eval:n { `#1 - \int_compare:nNnTF { `#1 } < { 91 } { 64 } { 96 } } }
+ { `#1 - \int_compare:nNnTF { `#1 } < { 91 } { 64 } { 96 } }
\cs_new:Npn \int_from_base:nn #1#2
{
\int_eval:n
{
- \__int_get_sign:n {#1}
- \exp_args:Nf \__int_from_base:nn
- { \__int_get_digits:n {#1} } {#2}
+ \__int_pass_signs:wn #1
+ \q_stop { \__int_from_base:nnN { 0 } {#2} }
+ \q_recursion_tail \q_recursion_stop
}
}
-\cs_new:Npn \__int_from_base:nn #1#2
- { \__int_from_base:nnN { 0 } { #2 } #1 \q_nil }
\cs_new:Npn \__int_from_base:nnN #1#2#3
{
- \quark_if_nil:NTF #3
- {#1}
- {
- \exp_args:Nf \__int_from_base:nnN
- { \int_eval:n { #1 * #2 + \__int_from_base:N #3 } }
- {#2}
- }
+ \quark_if_recursion_tail_stop_do:Nn #3 {#1}
+ \exp_args:Nf \__int_from_base:nnN
+ { \int_eval:n { #1 * #2 + \__int_from_base:N #3 } }
+ {#2}
}
\cs_new:Npn \__int_from_base:N #1
{
\int_compare:nNnTF { `#1 } < { 58 }
{#1}
- {
- \int_eval:n
- { `#1 - \int_compare:nNnTF { `#1 } < { 91 } { 55 } { 87 } }
- }
+ { `#1 - \int_compare:nNnTF { `#1 } < { 91 } { 55 } { 87 } }
}
\cs_new:Npn \int_from_bin:n #1
{ \int_from_base:nn {#1} \c_two }
@@ -4522,50 +4530,40 @@
\int_const:cn { c__int_from_roman_M_int } { 1000 }
\cs_new:Npn \int_from_roman:n #1
{
- \tl_if_blank:nF {#1}
+ \int_eval:n
{
- \exp_after:wN \__int_from_roman_end:w
- \__int_value:w \__int_eval:w
- \__int_from_roman:NN #1 Q \q_stop
+ (
+ \c_zero
+ \exp_after:wN \__int_from_roman:NN \tl_to_str:n {#1}
+ \q_recursion_tail \q_recursion_tail \q_recursion_stop
+ )
}
}
\cs_new:Npn \__int_from_roman:NN #1#2
{
- \str_if_eq:nnTF {#1} { Q }
- {#1#2}
+ \quark_if_recursion_tail_stop:N #1
+ \int_if_exist:cF { c__int_from_roman_ #1 _int }
+ { \__int_from_roman_error:w }
+ \quark_if_recursion_tail_stop_do:Nn #2
+ { + \use:c { c__int_from_roman_ #1 _int } }
+ \int_if_exist:cF { c__int_from_roman_ #2 _int }
+ { \__int_from_roman_error:w }
+ \int_compare:nNnTF
+ { \use:c { c__int_from_roman_ #1 _int } }
+ <
+ { \use:c { c__int_from_roman_ #2 _int } }
{
- \str_if_eq:nnTF {#2} { Q }
- {
- \int_if_exist:cF { c__int_from_roman_ #1 _int }
- { \__int_from_roman_clean_up:w }
- +
- \use:c { c__int_from_roman_ #1 _int }
- #2
- }
- {
- \int_if_exist:cF { c__int_from_roman_ #1 _int }
- { \__int_from_roman_clean_up:w }
- \int_if_exist:cF { c__int_from_roman_ #2 _int }
- { \__int_from_roman_clean_up:w }
- \int_compare:nNnTF
- { \use:c { c__int_from_roman_ #1 _int } }
- <
- { \use:c { c__int_from_roman_ #2 _int } }
- {
- + \use:c { c__int_from_roman_ #2 _int }
- - \use:c { c__int_from_roman_ #1 _int }
- \__int_from_roman:NN
- }
- {
- + \use:c { c__int_from_roman_ #1 _int }
- \__int_from_roman:NN #2
- }
- }
+ + \use:c { c__int_from_roman_ #2 _int }
+ - \use:c { c__int_from_roman_ #1 _int }
+ \__int_from_roman:NN
+ }
+ {
+ + \use:c { c__int_from_roman_ #1 _int }
+ \__int_from_roman:NN #2
}
}
-\cs_new:Npn \__int_from_roman_end:w #1 Q #2 \q_stop
- { \tl_if_empty:nTF {#2} {#1} {#2} }
-\cs_new:Npn \__int_from_roman_clean_up:w #1 Q { + 0 Q -1 }
+\cs_new:Npn \__int_from_roman_error:w #1 \q_recursion_stop #2
+ { #2 * \c_zero - \c_one }
\cs_new_eq:NN \int_show:N \__kernel_register_show:N
\cs_new_eq:NN \int_show:c \__kernel_register_show:c
\cs_new_protected:Npn \int_show:n #1
@@ -4575,10 +4573,13 @@
\int_const:Nn \c_three { 3 }
\int_const:Nn \c_four { 4 }
\int_const:Nn \c_five { 5 }
+\int_const:Nn \c_six { 6 }
+\int_const:Nn \c_seven { 7 }
\int_const:Nn \c_eight { 8 }
\int_const:Nn \c_nine { 9 }
\int_const:Nn \c_ten { 10 }
\int_const:Nn \c_eleven { 11 }
+\int_const:Nn \c_twelve { 12 }
\int_const:Nn \c_thirteen { 13 }
\int_const:Nn \c_fourteen { 14 }
\int_const:Nn \c_fifteen { 15 }
@@ -4632,7 +4633,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3quark.dtx 4889 2014-05-26 19:59:25Z joseph $
+\GetIdInfo$Id: l3quark.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Quarks}
\cs_new_protected:Npn \quark_new:N #1 { \tl_const:Nn #1 {#1} }
\quark_new:N \q_nil
@@ -4657,20 +4658,20 @@
}
\cs_new:Npn \quark_if_recursion_tail_stop:n #1
{
- \if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero
- \exp_after:wN \use_none_delimit_by_q_recursion_stop:w
- \fi:
+ \tl_if_empty:oTF
+ { \__quark_if_recursion_tail:w {} #1 {} ?! \q_recursion_tail ??! }
+ { \use_none_delimit_by_q_recursion_stop:w }
+ { }
}
\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1
{
- \if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero
- \exp_after:wN \use_i_delimit_by_q_recursion_stop:nw
- \else:
- \exp_after:wN \use_none:n
- \fi:
+ \tl_if_empty:oTF
+ { \__quark_if_recursion_tail:w {} #1 {} ?! \q_recursion_tail ??! }
+ { \use_i_delimit_by_q_recursion_stop:nw }
+ { \use_none:n }
}
+\cs_new:Npn \__quark_if_recursion_tail:w
+ #1 \q_recursion_tail #2 ? #3 ?! { #1 #2 }
\cs_generate_variant:Nn \quark_if_recursion_tail_stop:n { o }
\cs_generate_variant:Nn \quark_if_recursion_tail_stop_do:nn { o }
\cs_new:Npn \__quark_if_recursion_tail_break:NN #1#2
@@ -4681,10 +4682,10 @@
}
\cs_new:Npn \__quark_if_recursion_tail_break:nN #1#2
{
- \if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero
- \exp_after:wN #2
- \fi:
+ \tl_if_empty:oTF
+ { \__quark_if_recursion_tail:w {} #1 {} ?! \q_recursion_tail ??! }
+ {#2}
+ { }
}
\prg_new_conditional:Nnn \quark_if_nil:N { p, T , F , TF }
{
@@ -4708,22 +4709,16 @@
\cs_generate_variant:Nn \quark_if_no_value:NTF { c }
\prg_new_conditional:Nnn \quark_if_nil:n { p, T , F , TF }
{
- \if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:N \q_nil } { \exp_not:n {#1} } = \c_zero
- \prg_return_true:
- \else:
- \prg_return_false:
- \fi:
+ \__tl_if_empty_return:o
+ { \__quark_if_nil:w {} #1 {} ? ! \q_nil ? ? ! }
}
+\cs_new:Npn \__quark_if_nil:w #1 \q_nil #2 ? #3 ? ! { #1 #2 }
\prg_new_conditional:Nnn \quark_if_no_value:n { p, T , F , TF }
{
- \if_int_compare:w \__str_if_eq_x:nn
- { \exp_not:N \q_no_value } { \exp_not:n {#1} } = \c_zero
- \prg_return_true:
- \else:
- \prg_return_false:
- \fi:
+ \__tl_if_empty_return:o
+ { \__quark_if_no_value:w {} #1 {} ? ! \q_no_value ? ? ! }
}
+\cs_new:Npn \__quark_if_no_value:w #1 \q_no_value #2 ? #3 ? ! { #1 #2 }
\cs_generate_variant:Nn \quark_if_nil_p:n { V , o }
\cs_generate_variant:Nn \quark_if_nil:nTF { V , o }
\cs_generate_variant:Nn \quark_if_nil:nT { V , o }
@@ -4782,7 +4777,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3prg.dtx 4728 2014-05-04 13:25:37Z joseph $
+\GetIdInfo$Id: l3prg.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Control structures}
%%
\tex_let:D \if_bool:N \tex_ifodd:D
@@ -4889,8 +4884,10 @@
\bool_new:N \l_tmpb_bool
\bool_new:N \g_tmpa_bool
\bool_new:N \g_tmpb_bool
-\prg_new_eq_conditional:NNn \bool_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \bool_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \bool_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \bool_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\prg_new_conditional:Npnn \bool_if:n #1 { T , F , TF }
{
\if_predicate:w \bool_if_p:n {#1}
@@ -4953,8 +4950,10 @@
\cs_new_nopar:cpn { __bool_S_1:w } { \group_align_safe_end: \c_true_bool }
\cs_new_nopar:cpn { __bool_&_1:w } & { \__bool_get_next:NN \use_i:nn }
\cs_new_nopar:cpn { __bool_|_0:w } | { \__bool_get_next:NN \use_i:nn }
-\cs_new_nopar:cpn { __bool_&_0:w } & { \__bool_eval_skip_to_end_auxi:Nw \c_false_bool }
-\cs_new_nopar:cpn { __bool_|_1:w } | { \__bool_eval_skip_to_end_auxi:Nw \c_true_bool }
+\cs_new_nopar:cpn { __bool_&_0:w } &
+ { \__bool_eval_skip_to_end_auxi:Nw \c_false_bool }
+\cs_new_nopar:cpn { __bool_|_1:w } |
+ { \__bool_eval_skip_to_end_auxi:Nw \c_true_bool }
%% (
\cs_new:Npn \__bool_eval_skip_to_end_auxi:Nw #1#2 )
{
@@ -5029,9 +5028,12 @@
\cs_new:Npn \__prg_replicate_first:N #1
{ \cs:w __prg_replicate_first_ #1 :n \__prg_replicate:N }
\cs_new:Npn \__prg_replicate_ :n #1 { \cs_end: }
-\cs_new:cpn { __prg_replicate_0:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} }
-\cs_new:cpn { __prg_replicate_1:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1 }
-\cs_new:cpn { __prg_replicate_2:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1 }
+\cs_new:cpn { __prg_replicate_0:n } #1
+ { \cs_end: {#1#1#1#1#1#1#1#1#1#1} }
+\cs_new:cpn { __prg_replicate_1:n } #1
+ { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1 }
+\cs_new:cpn { __prg_replicate_2:n } #1
+ { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1 }
\cs_new:cpn { __prg_replicate_3:n } #1
{ \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1#1 }
\cs_new:cpn { __prg_replicate_4:n } #1
@@ -5142,7 +5144,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3clist.dtx 5237 2014-07-19 15:09:54Z bruno $
+\GetIdInfo$Id: l3clist.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Comma separated lists}
\cs_new_eq:NN \c_empty_clist \c_empty_tl
\tl_new:N \l__clist_internal_clist
@@ -5211,8 +5213,10 @@
}
\cs_generate_variant:Nn \clist_concat:NNN { ccc }
\cs_generate_variant:Nn \clist_gconcat:NNN { ccc }
-\prg_new_eq_conditional:NNn \clist_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \clist_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \clist_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \clist_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new:Npn \__clist_trim_spaces_generic:nw #1#2 ,
{
\__tl_trim_spaces:nn {#2}
@@ -5422,8 +5426,10 @@
{ #3 ? #2 \q_mark #3 #4 \q_stop #1 , #5 \q_mark }
\cs_new:Npn \__clist_reverse_end:ww #1 ! #2 , \q_mark
{ \exp_not:o { \use_none:n #2 } }
-\prg_new_eq_conditional:NNn \clist_if_empty:N \tl_if_empty:N { p , T , F , TF }
-\prg_new_eq_conditional:NNn \clist_if_empty:c \tl_if_empty:c { p , T , F , TF }
+\prg_new_eq_conditional:NNn \clist_if_empty:N \tl_if_empty:N
+ { p , T , F , TF }
+\prg_new_eq_conditional:NNn \clist_if_empty:c \tl_if_empty:c
+ { p , T , F , TF }
\prg_new_conditional:Npnn \clist_if_empty:n #1 { p , T , F , TF }
{
\__clist_if_empty_n:w ? #1
@@ -5583,7 +5589,10 @@
\q_stop { }
}
}
- { \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#1} }
+ {
+ \__msg_kernel_expandable_error:nnn
+ { kernel } { bad-variable } {#1}
+ }
}
\cs_generate_variant:Nn \clist_use:Nnnn { c }
\cs_new:Npn \__clist_use:wwn #1 , #2 , #3 { \exp_not:n { #1 #3 #2 } }
@@ -5702,14 +5711,14 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3token.dtx 4889 2014-05-26 19:59:25Z joseph $
+\GetIdInfo$Id: l3token.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Experimental token manipulation}
\cs_new_protected:Npn \char_set_catcode:nn #1#2
{ \tex_catcode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_catcode:n #1
{ \tex_the:D \tex_catcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_catcode:n #1
- { \tex_showthe:D \tex_catcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_catcode:n {#1} } }
\cs_new_protected:Npn \char_set_catcode_escape:N #1
{ \char_set_catcode:nn { `#1 } \c_zero }
\cs_new_protected:Npn \char_set_catcode_group_begin:N #1
@@ -5779,25 +5788,25 @@
\cs_new:Npn \char_value_mathcode:n #1
{ \tex_the:D \tex_mathcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_mathcode:n #1
- { \tex_showthe:D \tex_mathcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_mathcode:n {#1} } }
\cs_new_protected:Npn \char_set_lccode:nn #1#2
{ \tex_lccode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_lccode:n #1
{ \tex_the:D \tex_lccode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_lccode:n #1
- { \tex_showthe:D \tex_lccode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_lccode:n {#1} } }
\cs_new_protected:Npn \char_set_uccode:nn #1#2
{ \tex_uccode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_uccode:n #1
{ \tex_the:D \tex_uccode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_uccode:n #1
- { \tex_showthe:D \tex_uccode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_uccode:n {#1} } }
\cs_new_protected:Npn \char_set_sfcode:nn #1#2
{ \tex_sfcode:D #1 = \__int_eval:w #2 \__int_eval_end: }
\cs_new:Npn \char_value_sfcode:n #1
{ \tex_the:D \tex_sfcode:D \__int_eval:w #1\__int_eval_end: }
\cs_new_protected:Npn \char_show_value_sfcode:n #1
- { \tex_showthe:D \tex_sfcode:D \__int_eval:w #1 \__int_eval_end: }
+ { \int_show:n { \char_value_sfcode:n {#1} } }
\cs_new_protected:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 }
\cs_new_eq:NN \c_group_begin_token {
\cs_new_eq:NN \c_group_end_token }
@@ -5866,7 +5875,8 @@
\prg_return_true: \else: \prg_return_false: \fi:
}
\group_end:
-\prg_new_conditional:Npnn \token_if_math_superscript:N #1 { p , T , F , TF }
+\prg_new_conditional:Npnn \token_if_math_superscript:N #1
+ { p , T , F , TF }
{
\if_catcode:w \exp_not:N #1 \c_math_superscript_token
\prg_return_true: \else: \prg_return_false: \fi:
@@ -5981,7 +5991,7 @@
{ \token_to_str:N \mathchar }
}
\cs_new:Npn \__token_if_chardef:w #1 CHAR" #2 \q_stop { #1 CHAR }
- \prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF }
{
\if_meaning:w \tex_dimen:D #1
\prg_return_false:
@@ -5999,7 +6009,7 @@
\fi:
}
\cs_new:Npn \__token_if_dim_register:w #1 ZIMEX #2 \q_stop { #1 ~ }
- \prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF }
{
% \token_if_chardef:NTF #1 { \prg_return_true: }
% {
@@ -6023,7 +6033,8 @@
% }
}
\cs_new:Npn \__token_if_int_register:w #1 COUXY #2 \q_stop { #1 ~ }
- \prg_new_conditional:Npnn \token_if_muskip_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_muskip_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_muskip:D #1
\prg_return_false:
@@ -6041,7 +6052,8 @@
\fi:
}
\cs_new:Npn \__token_if_muskip_register:w #1 MUSKIP #2 \q_stop { #1 ~ }
- \prg_new_conditional:Npnn \token_if_skip_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_skip_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_skip:D #1
\prg_return_false:
@@ -6059,7 +6071,8 @@
\fi:
}
\cs_new:Npn \__token_if_skip_register:w #1 SKIP #2 \q_stop { #1 ~ }
- \prg_new_conditional:Npnn \token_if_toks_register:N #1 { p , T , F , TF }
+ \prg_new_conditional:Npnn \token_if_toks_register:N #1
+ { p , T , F , TF }
{
\if_meaning:w \tex_toks:D #1
\prg_return_false:
@@ -6406,7 +6419,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3prop.dtx 5215 2014-07-17 13:23:20Z joseph $
+\GetIdInfo$Id: l3prop.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Property lists}
\__scan_new:N \s__prop
\cs_new:Npn \__prop_pair:wn #1 \s__prop #2
@@ -6577,8 +6590,10 @@
}
\cs_generate_variant:Nn \prop_put_if_new:Nnn { c }
\cs_generate_variant:Nn \prop_gput_if_new:Nnn { c }
-\prg_new_eq_conditional:NNn \prop_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \prop_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \prop_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \prop_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\prg_new_conditional:Npnn \prop_if_empty:N #1 { p , T , F , TF }
{
\tl_if_eq:NNTF #1 \c_empty_prop
@@ -6708,7 +6723,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3msg.dtx 4943 2014-05-30 17:26:32Z bruno $
+\GetIdInfo$Id: l3msg.dtx 5358 2014-08-24 09:19:52Z bruno $
{L3 Messages}
\tl_new:N \l__msg_internal_tl
\tl_const:Nn \c__msg_text_prefix_tl { msg~text~>~ }
@@ -6827,6 +6842,7 @@
|...............................................
}
}
+
\group_begin:
\char_set_lccode:nn {`\{} {`\ }
\char_set_lccode:nn {`\}} {`\ }
@@ -6844,19 +6860,25 @@
\iow_newline:
!
}
- \group_begin:
- \cs_set_protected_nopar:Npn &
- {
- \tex_errmessage:D
- {
- #1
- \use_none:n
- { ............................................ }
- }
- }
- \exp_after:wN
- \group_end:
- &
+ \__iow_with:Nnn \tex_newlinechar:D { `\^^J }
+ {
+ \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+ {
+ \group_begin:
+ \cs_set_protected_nopar:Npn &
+ {
+ \tex_errmessage:D
+ {
+ #1
+ \use_none:n
+ { ............................................ }
+ }
+ }
+ \exp_after:wN
+ \group_end:
+ &
+ }
+ }
}
}
\cs_new_protected:Npn \msg_log:n #1
@@ -6886,7 +6908,8 @@
\cs_set_protected:Npn \__msg_class_new:nn #1#2
{
\prop_new:c { l__msg_redirect_ #1 _prop }
- \cs_new_protected:cpn { __msg_ #1 _code:nnnnnn } ##1##2##3##4##5##6 {#2}
+ \cs_new_protected:cpn { __msg_ #1 _code:nnnnnn }
+ ##1##2##3##4##5##6 {#2}
\cs_new_protected:cpn { msg_ #1 :nnnnnn } ##1##2##3##4##5##6
{
\use:x
@@ -7102,7 +7125,8 @@
\tl_if_eq:NNTF \l__msg_class_tl \l__msg_current_class_tl
{
\prop_put:cnn { l__msg_redirect_ #2 _prop } {#3} {#2}
- \__msg_kernel_warning:nnxxxx { kernel } { message-redirect-loop }
+ \__msg_kernel_warning:nnxxxx
+ { kernel } { message-redirect-loop }
{ \seq_item:Nn \l__msg_class_loop_seq { \c_one } }
{ \seq_item:Nn \l__msg_class_loop_seq { \c_two } }
{#3}
@@ -7432,8 +7456,14 @@
\tl_if_empty:nTF {#1}
{ \tl_clear:N \l__msg_internal_tl }
{ \tl_set:Nf \l__msg_internal_tl { \__msg_show_variable_aux:w #1 } }
- \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
- { \exp_after:wN \l__msg_internal_tl }
+ \__iow_with:Nnn \tex_newlinechar:D { 10 }
+ {
+ \__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
+ {
+ \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
+ { \exp_after:wN \l__msg_internal_tl }
+ }
+ }
}
\cs_new:Npn \__msg_show_variable_aux:w #1 > { }
\cs_new:Npn \__msg_show_item:n #1
@@ -7482,7 +7512,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3file.dtx 5188 2014-07-09 12:02:22Z will $
+\GetIdInfo$Id: l3file.dtx 5369 2014-08-24 22:41:47Z bruno $
{L3 File and I/O operations}
\tl_new:N \g_file_current_name_tl
\tl_gset_eq:NN \g_file_current_name_tl \@currname
@@ -7520,7 +7550,8 @@
}
}
{
- \__msg_kernel_error:nnx { kernel } { unbalanced-quote-in-filename }
+ \__msg_kernel_error:nnx
+ { kernel } { unbalanced-quote-in-filename }
{ \l__file_internal_name_tl }
}
\use:x
@@ -7531,7 +7562,7 @@
}
\cs_new:Npn \__file_name_sanitize_aux:n #1
{
- \str_if_eq:nnT {#1} { " }
+ \token_if_eq_charcode:NNT #1 "
{ + \c_one }
}
\cs_new_protected:Npn \file_add_path:nN #1
@@ -7549,7 +7580,8 @@
\tl_set:Nn #2 { \q_no_value }
\cs_if_exist:NT \input@path
{
- \seq_set_eq:NN \l__file_saved_search_path_seq \l__file_search_path_seq
+ \seq_set_eq:NN \l__file_saved_search_path_seq
+ \l__file_search_path_seq
\seq_set_split:NnV \l__file_internal_seq { , } \input@path
\seq_concat:NNN \l__file_search_path_seq
\l__file_search_path_seq \l__file_internal_seq
@@ -7564,7 +7596,10 @@
}
}
\cs_if_exist:NT \input@path
- { \seq_set_eq:NN \l__file_search_path_seq \l__file_saved_search_path_seq }
+ {
+ \seq_set_eq:NN \l__file_search_path_seq
+ \l__file_saved_search_path_seq
+ }
}
\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
{
@@ -7643,7 +7678,17 @@
\seq_new:N \g__ior_streams_seq
\tl_new:N \l__ior_stream_tl
\prop_new:N \g__ior_streams_prop
-\prop_gput:Nnn \g__ior_streams_prop { 0 } { LaTeX2e~reserved }
+\int_step_inline:nnnn
+ { \c_zero }
+ { \c_one }
+ {
+ \cs_if_exist:NTF \normalend
+ { \tex_count:D 38 \scan_stop: }
+ { \tex_count:D 16 \scan_stop: - \c_one }
+ }
+ {
+ \prop_gput:Nnn \g__ior_streams_prop {#1} { Reserved~by~format }
+ }
\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_term_ior }
\cs_generate_variant:Nn \ior_new:N { c }
\cs_new_protected:Npn \ior_open:Nn #1#2
@@ -7745,9 +7790,17 @@
\seq_new:N \g__iow_streams_seq
\tl_new:N \l__iow_stream_tl
\prop_new:N \g__iow_streams_prop
-\prop_put:Nnn \g__iow_streams_prop { 0 } { LaTeX2e~reserved }
-\prop_put:Nnn \g__iow_streams_prop { 1 } { LaTeX2e~reserved }
-\prop_put:Nnn \g__iow_streams_prop { 2 } { LaTeX2e~reserved }
+\int_step_inline:nnnn
+ { \c_zero }
+ { \c_one }
+ {
+ \cs_if_exist:NTF \normalend
+ { \tex_count:D 39 \scan_stop: }
+ { \tex_count:D 17 \scan_stop: - \c_one }
+ }
+ {
+ \prop_gput:Nnn \g__iow_streams_prop {#1} { Reserved~by~format }
+ }
\cs_new_protected:Npn \iow_new:N #1 { \cs_new_eq:NN #1 \c_term_iow }
\cs_generate_variant:Nn \iow_new:N { c }
\cs_new_protected:Npn \iow_open:Nn #1#2
@@ -7792,8 +7845,23 @@
\cs_new_protected:Npn \iow_shipout:Nn #1#2
{ \tex_write:D #1 { \exp_not:n {#2} } }
\cs_generate_variant:Nn \iow_shipout:Nn { c, Nx, cx }
+\cs_new_protected:Npn \__iow_with:Nnn #1#2
+ {
+ \int_compare:nNnTF {#1} = {#2}
+ { \use:n }
+ { \exp_args:No \__iow_with_aux:nNnn { \int_use:N #1 } #1 {#2} }
+ }
+\cs_new_protected:Npn \__iow_with_aux:nNnn #1#2#3#4
+ {
+ \int_set:Nn #2 {#3}
+ #4
+ \int_set:Nn #2 {#1}
+ }
\cs_new_protected:Npn \iow_now:Nn #1#2
- { \tex_immediate:D \tex_write:D #1 { \exp_not:n {#2} } }
+ {
+ \__iow_with:Nnn \tex_newlinechar:D { `\^^J }
+ { \tex_immediate:D \tex_write:D #1 { \exp_not:n {#2} } }
+ }
\cs_generate_variant:Nn \iow_now:Nn { c, Nx, cx }
\cs_set_protected_nopar:Npn \iow_log:x { \iow_now:Nx \c_log_iow }
\cs_new_protected_nopar:Npn \iow_log:n { \iow_now:Nn \c_log_iow }
@@ -7964,7 +8032,8 @@
{
\__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
+ { 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
@@ -8034,7 +8103,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3skip.dtx 5211 2014-07-17 07:22:35Z joseph $
+\GetIdInfo$Id: l3skip.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Dimensions and skips}
\cs_new_eq:NN \if_dim:w \tex_ifdim:D
\cs_new_eq:NN \__dim_eval:w \etex_dimexpr:D
@@ -8061,8 +8130,10 @@
{ \dim_if_exist:NTF #1 { \dim_gzero:N #1 } { \dim_new:N #1 } }
\cs_generate_variant:Nn \dim_zero_new:N { c }
\cs_generate_variant:Nn \dim_gzero_new:N { c }
-\prg_new_eq_conditional:NNn \dim_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \dim_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \dim_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \dim_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_protected:Npn \dim_set:Nn #1#2
{ #1 ~ \__dim_eval:w #2 \__dim_eval_end: }
\cs_new_protected:Npn \dim_gset:Nn { \tex_global:D \dim_set:Nn }
@@ -8306,8 +8377,10 @@
{ \skip_if_exist:NTF #1 { \skip_gzero:N #1 } { \skip_new:N #1 } }
\cs_generate_variant:Nn \skip_zero_new:N { c }
\cs_generate_variant:Nn \skip_gzero_new:N { c }
-\prg_new_eq_conditional:NNn \skip_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \skip_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \skip_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \skip_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_protected:Npn \skip_set:Nn #1#2
{ #1 ~ \etex_glueexpr:D #2 \scan_stop: }
\cs_new_protected:Npn \skip_gset:Nn { \tex_global:D \skip_set:Nn }
@@ -8395,8 +8468,10 @@
{ \muskip_if_exist:NTF #1 { \muskip_gzero:N #1 } { \muskip_new:N #1 } }
\cs_generate_variant:Nn \muskip_zero_new:N { c }
\cs_generate_variant:Nn \muskip_gzero_new:N { c }
-\prg_new_eq_conditional:NNn \muskip_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \muskip_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \muskip_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \muskip_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_protected:Npn \muskip_set:Nn #1#2
{ #1 ~ \etex_muexpr:D #2 \scan_stop: }
\cs_new_protected:Npn \muskip_gset:Nn { \tex_global:D \muskip_set:Nn }
@@ -8467,7 +8542,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3keys.dtx 5121 2014-06-12 17:37:56Z joseph $
+\GetIdInfo$Id: l3keys.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Key-value interfaces}
\int_new:N \g__keyval_level_int
\tl_new:N \l__keyval_key_tl
@@ -8512,7 +8587,11 @@
\tl_put_right:Nx \l__keyval_parse_tl
{
\exp_not:c
- { __keyval_key_no_value_elt_ \int_use:N \g__keyval_level_int :n }
+ {
+ __keyval_key_no_value_elt_
+ \int_use:N \g__keyval_level_int
+ :n
+ }
{ \exp_not:o \l__keyval_key_tl }
}
}
@@ -8685,9 +8764,11 @@
{ \__keys_choice_make:N \__keys_multichoice_find:n }
\cs_new_protected_nopar:Npn \__keys_choice_make:N #1
{
- \prop_if_exist:cTF { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
+ \prop_if_exist:cTF
+ { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
{
- \prop_get:cnNTF { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
+ \prop_get:cnNTF
+ { \c__keys_info_root_tl \__keys_parent:o \l_keys_path_tl }
{ choice } \l_keys_value_tl
{
\__msg_kernel_error:nnxx { kernel } { nested-choice-key }
@@ -8748,7 +8829,10 @@
\cs_new_protected:Npn \__keys_default_set:n #1
{
\prop_if_exist:cT { \c__keys_info_root_tl \l_keys_path_tl }
- { \prop_put:cnn { \c__keys_info_root_tl \l_keys_path_tl } { default } {#1} }
+ {
+ \prop_put:cnn { \c__keys_info_root_tl \l_keys_path_tl }
+ { default } {#1}
+ }
}
\cs_new_protected:Npn \__keys_groups_set:n #1
{
@@ -8766,7 +8850,10 @@
\cs_new_protected:Npn \__keys_meta_make:n #1
{
\__keys_cmd_set:Vo \l_keys_path_tl
- { \exp_after:wN \keys_set:nn \exp_after:wN { \l__keys_module_tl } {#1} }
+ {
+ \exp_after:wN \keys_set:nn
+ \exp_after:wN { \l__keys_module_tl } {#1}
+ }
}
\cs_new_protected:Npn \__keys_meta_make:nn #1#2
{ \__keys_cmd_set:Vn \l_keys_path_tl { \keys_set:nn {#1} {#2} } }
@@ -8774,16 +8861,23 @@
{
\prop_if_exist:cT { \c__keys_info_root_tl \l_keys_path_tl }
{
- \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl } { required }
- \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl } { forbidden }
- \prop_put:cnn { \c__keys_info_root_tl \l_keys_path_tl } {#1} { true }
+ \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl }
+ { required }
+ \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl }
+ { forbidden }
+ \prop_put:cnn { \c__keys_info_root_tl \l_keys_path_tl }
+ {#1} { true }
}
}
\cs_new_protected:Npn \__keys_variable_set:NnnN #1#2#3#4
{
\use:c { #2_if_exist:NF } #1 { \use:c { #2 _new:N } #1 }
\__keys_cmd_set:nx { \l_keys_path_tl }
- { \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 \exp_not:n { {##1} } }
+ {
+ \exp_not:c { #2 _ #3 set:N #4 }
+ \exp_not:N #1
+ \exp_not:n { {##1} }
+ }
}
\cs_generate_variant:Nn \__keys_variable_set:NnnN { c }
\cs_new_protected:cpn { \c__keys_props_root_tl .bool_set:N } #1
@@ -9116,7 +9210,8 @@
{ \prg_return_true: }
{ \prg_return_false: }
}
-\prg_new_conditional:Npnn \keys_if_choice_exist:nnn #1#2#3 { p , T , F , TF }
+\prg_new_conditional:Npnn \keys_if_choice_exist:nnn #1#2#3
+ { p , T , F , TF }
{
\cs_if_exist:cTF { \c__keys_code_root_tl #1 / #2 / #3 }
{ \prg_return_true: }
@@ -9136,7 +9231,8 @@
\__msg_kernel_new:nnnn { kernel } { key-choice-unknown }
{ Key~'#1'~accepts~only~a~fixed~set~of~choices. }
{
- The~key~'#1'~only~accepts~predefined~values,~and~'#2'~is~not~one~of~these.
+ The~key~'#1'~only~accepts~predefined~values,~
+ and~'#2'~is~not~one~of~these.
}
\__msg_kernel_new:nnnn { kernel } { key-no-property }
{ No~property~given~in~definition~of~key~'#1'. }
@@ -9269,7 +9365,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3fp.dtx 5223 2014-07-18 01:54:05Z bruno $
+\GetIdInfo$Id: l3fp.dtx 5336 2014-08-22 10:26:35Z bruno $
{L3 Floating points}
%% File: l3fp-aux.dtx Copyright(C) 2011-2014 The LaTeX3 Project
%%
@@ -9333,8 +9429,10 @@
\tl_const:Nn \c_minus_inf_fp { \s__fp \__fp_chk:w 2 2 \s__fp_exact ; }
\tl_const:Nn \c_nan_fp { \s__fp \__fp_chk:w 3 1 \s__fp_exact ; }
\int_const:Nn \c__fp_max_exponent_int { 10000 }
-\cs_new:Npn \__fp_zero_fp:N #1 { \s__fp \__fp_chk:w 0 #1 \s__fp_underflow ; }
-\cs_new:Npn \__fp_inf_fp:N #1 { \s__fp \__fp_chk:w 2 #1 \s__fp_overflow ; }
+\cs_new:Npn \__fp_zero_fp:N #1
+ { \s__fp \__fp_chk:w 0 #1 \s__fp_underflow ; }
+\cs_new:Npn \__fp_inf_fp:N #1
+ { \s__fp \__fp_chk:w 2 #1 \s__fp_overflow ; }
\cs_new:Npn \__fp_min_fp:N #1
{
\s__fp \__fp_chk:w 1 #1
@@ -9360,9 +9458,10 @@
{ \__int_eval:w \c_two - #1 \__int_eval_end: }
\cs_new:Npn \__fp_sanitize:Nw #1 #2;
{
- \if_case:w \if_int_compare:w #2 > \c__fp_max_exponent_int \c_one \else:
- \if_int_compare:w #2 < - \c__fp_max_exponent_int \c_two \else:
- \if_meaning:w 1 #1 \c_three \else: \c_zero \fi: \fi: \fi:
+ \if_case:w
+ \if_int_compare:w #2 > \c__fp_max_exponent_int \c_one \else:
+ \if_int_compare:w #2 < - \c__fp_max_exponent_int \c_two \else:
+ \if_meaning:w 1 #1 \c_three \else: \c_zero \fi: \fi: \fi:
\or: \exp_after:wN \__fp_overflow:w
\or: \exp_after:wN \__fp_underflow:w
\or: \exp_after:wN \__fp_sanitize_zero:w
@@ -9370,7 +9469,8 @@
\s__fp \__fp_chk:w 1 #1 {#2}
}
\cs_new:Npn \__fp_sanitize:wN #1; #2 { \__fp_sanitize:Nw #2 #1; }
-\cs_new:Npn \__fp_sanitize_zero:w \s__fp \__fp_chk:w #1 #2 #3; { \c_zero_fp }
+\cs_new:Npn \__fp_sanitize_zero:w \s__fp \__fp_chk:w #1 #2 #3;
+ { \c_zero_fp }
\cs_new:Npn \__fp_exp_after_o:w \s__fp \__fp_chk:w #1
{
\if_meaning:w 1 #1
@@ -9475,22 +9575,22 @@
\__fp_decimate_pack:nnnnnnnnnnw #3 ;
}
}
-\__fp_tmp:w {i} {\use_none:nnn #50} { 0{#2}#3{#4}#5 }
-\__fp_tmp:w {ii} {\use_none:nn #5 } { 00{#2}#3{#4}#5 }
-\__fp_tmp:w {iii} {\use_none:n #5 } { 000{#2}#3{#4}#5 }
-\__fp_tmp:w {iv} { #5 } { {0000}#2{#3}#4 #5 }
-\__fp_tmp:w {v} {\use_none:nnn #4#5 } { 0{0000}#2{#3}#4 #5 }
-\__fp_tmp:w {vi} {\use_none:nn #4#5 } { 00{0000}#2{#3}#4 #5 }
-\__fp_tmp:w {vii} {\use_none:n #4#5 } { 000{0000}#2{#3}#4 #5 }
-\__fp_tmp:w {viii}{ #4#5 } { {0000}0000{#2}#3 #4 #5 }
-\__fp_tmp:w {ix} {\use_none:nnn #3#4+#5} { 0{0000}0000{#2}#3 #4 #5 }
-\__fp_tmp:w {x} {\use_none:nn #3#4+#5} { 00{0000}0000{#2}#3 #4 #5 }
-\__fp_tmp:w {xi} {\use_none:n #3#4+#5} { 000{0000}0000{#2}#3 #4 #5 }
-\__fp_tmp:w {xii} { #3#4+#5} { {0000}0000{0000}#2 #3 #4 #5 }
-\__fp_tmp:w {xiii}{\use_none:nnn#2#3+#4#5} { 0{0000}0000{0000}#2 #3 #4 #5 }
-\__fp_tmp:w {xiv} {\use_none:nn #2#3+#4#5} { 00{0000}0000{0000}#2 #3 #4 #5 }
-\__fp_tmp:w {xv} {\use_none:n #2#3+#4#5} { 000{0000}0000{0000}#2 #3 #4 #5 }
-\__fp_tmp:w {xvi} { #2#3+#4#5} {{0000}0000{0000}0000 #2 #3 #4 #5 }
+\__fp_tmp:w {i} {\use_none:nnn #50}{ 0{#2}#3{#4}#5 }
+\__fp_tmp:w {ii} {\use_none:nn #5 }{ 00{#2}#3{#4}#5 }
+\__fp_tmp:w {iii} {\use_none:n #5 }{ 000{#2}#3{#4}#5 }
+\__fp_tmp:w {iv} { #5 }{ {0000}#2{#3}#4 #5 }
+\__fp_tmp:w {v} {\use_none:nnn #4#5 }{ 0{0000}#2{#3}#4 #5 }
+\__fp_tmp:w {vi} {\use_none:nn #4#5 }{ 00{0000}#2{#3}#4 #5 }
+\__fp_tmp:w {vii} {\use_none:n #4#5 }{ 000{0000}#2{#3}#4 #5 }
+\__fp_tmp:w {viii}{ #4#5 }{ {0000}0000{#2}#3 #4 #5 }
+\__fp_tmp:w {ix} {\use_none:nnn #3#4+#5}{ 0{0000}0000{#2}#3 #4 #5 }
+\__fp_tmp:w {x} {\use_none:nn #3#4+#5}{ 00{0000}0000{#2}#3 #4 #5 }
+\__fp_tmp:w {xi} {\use_none:n #3#4+#5}{ 000{0000}0000{#2}#3 #4 #5 }
+\__fp_tmp:w {xii} { #3#4+#5}{ {0000}0000{0000}#2 #3 #4 #5 }
+\__fp_tmp:w {xiii}{\use_none:nnn#2#3+#4#5}{ 0{0000}0000{0000}#2 #3 #4 #5 }
+\__fp_tmp:w {xiv} {\use_none:nn #2#3+#4#5}{ 00{0000}0000{0000}#2 #3 #4 #5 }
+\__fp_tmp:w {xv} {\use_none:n #2#3+#4#5}{ 000{0000}0000{0000}#2 #3 #4 #5 }
+\__fp_tmp:w {xvi} { #2#3+#4#5}{{0000}0000{0000}0000 #2 #3 #4 #5}
\cs_new:Npn \__fp_decimate_pack:nnnnnnnnnnw #1#2#3#4#5
{ \__fp_decimate_pack:nnnnnnw { #1#2#3#4#5 } }
\cs_new:Npn \__fp_decimate_pack:nnnnnnw #1 #2#3#4#5#6
@@ -9639,7 +9739,10 @@
\__msg_kernel_error:nnxx { kernel }
{ unknown-fpu-trap-type } {#1} {#2}
}
- { \__msg_kernel_error:nnx { kernel } { unknown-fpu-exception } {#1} }
+ {
+ \__msg_kernel_error:nnx
+ { kernel } { unknown-fpu-exception } {#1}
+ }
}
}
\cs_new_protected_nopar:Npn \__fp_trap_invalid_operation_set_error:
@@ -9751,7 +9854,10 @@
{ \__msg_kernel_expandable_error:nnnnn { kernel } { fp - #1 } }
\cs_generate_variant:Nn \__fp_error:nnnn { nnf, nff }
\__msg_kernel_new:nnnn { kernel } { unknown-fpu-exception }
- { The~FPU~exception~'#1'~is~not~known:~that~trap~will~never~be~triggered. }
+ {
+ The~FPU~exception~'#1'~is~not~known:~
+ that~trap~will~never~be~triggered.
+ }
{
The~only~exceptions~to~which~traps~can~be~attached~are \\
\iow_indent:n
@@ -11499,7 +11605,8 @@
\exp_after:wN #1
\fi:
}
-\cs_new:Npn \__fp_ternary_loop_break:w #1 \fi: #2 \__fp_ternary_break_point:n #3
+\cs_new:Npn \__fp_ternary_loop_break:w
+ #1 \fi: #2 \__fp_ternary_break_point:n #3
{
\c_zero = \c_zero \fi:
\exp_after:wN \__fp_ternary_auxii:NwwN
@@ -11934,11 +12041,11 @@
\exp_after:wN \__fp_mul_significand_keep:NNNNNw
\int_use:N \__int_eval:w 99990000 + #1*#8 + #2*#7 + #3*#6 +
\exp_after:wN \__fp_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #1*#9 + #2*#8 + #3*#7 + #4*#6 +
+ \int_use:N \__int_eval:w 99990000 + #1*#9 + #2*#8 + #3*#7 + #4*#6 +
\exp_after:wN \__fp_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #2*#9 + #3*#8 + #4*#7 +
+ \int_use:N \__int_eval:w 99990000 + #2*#9 + #3*#8 + #4*#7 +
\exp_after:wN \__fp_mul_significand_drop:NNNNNw
- \int_use:N \__int_eval:w 99990000 + #3*#9 + #4*#8 +
+ \int_use:N \__int_eval:w 99990000 + #3*#9 + #4*#8 +
\exp_after:wN \__fp_mul_significand_drop:NNNNNw
\int_use:N \__int_eval:w 100000000 + #4*#9 ;
; \exp_after:wN ;
@@ -13293,7 +13400,8 @@
{ \s__fp \__fp_chk:w #4#5#6; \s__fp \__fp_chk:w #1#2#3; }
\s__fp \__fp_chk:w #4#5#6;
}
-\cs_new:Npn \__fp_pow_zero_or_inf:ww \s__fp \__fp_chk:w #1#2; \s__fp \__fp_chk:w #3#4
+\cs_new:Npn \__fp_pow_zero_or_inf:ww
+ \s__fp \__fp_chk:w #1#2; \s__fp \__fp_chk:w #3#4
{
\if_meaning:w 1 #4
\__fp_case_return_same_o:w
@@ -13312,7 +13420,8 @@
\fi:
\s__fp \__fp_chk:w #3#4
}
-\cs_new:Npn \__fp_pow_normal:ww \s__fp \__fp_chk:w 1 #1#2#3; \s__fp \__fp_chk:w #4#5
+\cs_new:Npn \__fp_pow_normal:ww
+ \s__fp \__fp_chk:w 1 #1#2#3; \s__fp \__fp_chk:w #4#5
{
\if_int_compare:w \__str_if_eq_x:nn { #2 #3 }
{ 1 {1000} {0000} {0000} {0000} } = \c_zero
@@ -13372,7 +13481,7 @@
\exp_after:wN \__fp_pow_exponent:Nwnnnnnw % n\ln(10) - (-\ln(x))
\exp_after:wN +
\else:
- \exp_after:wN \__fp_pow_exponent:Nwnnnnnw % -( |n|\ln(10) + (-\ln(x)) )
+ \exp_after:wN \__fp_pow_exponent:Nwnnnnnw % -(|n|\ln(10) + (-\ln(x)))
\exp_after:wN -
\fi:
#2; #1;
@@ -13955,7 +14064,7 @@
\exp_after:wN \__fp_sin_series_aux_o:NNnwww
\exp_after:wN #1
\__int_value:w
- \if_int_odd:w \__int_eval:w ( #3 + \c_two ) / \c_four \__int_eval_end:
+ \if_int_odd:w \__int_eval:w (#3 + \c_two) / \c_four \__int_eval_end:
#2
\else:
\if_meaning:w #2 0 2 \else: 0 \fi:
@@ -13971,28 +14080,28 @@
\exp_after:wN \use_ii:nn
\fi:
{ % 1/18!
- \__fp_fixed_mul_sub_back:wwwn {0000}{0000}{0000}{0001}{5619}{2070};
- #4; {0000}{0000}{0000}{0477}{9477}{3324};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0000}{0011}{4707}{4559}{7730};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0000}{2087}{6756}{9878}{6810};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0027}{5573}{1922}{3985}{8907};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{2480}{1587}{3015}{8730}{1587};
- \__fp_fixed_mul_sub_back:wwwn #4; {0013}{8888}{8888}{8888}{8888}{8889};
- \__fp_fixed_mul_sub_back:wwwn #4; {0416}{6666}{6666}{6666}{6666}{6667};
- \__fp_fixed_mul_sub_back:wwwn #4; {5000}{0000}{0000}{0000}{0000}{0000};
- \__fp_fixed_mul_sub_back:wwwn #4;{10000}{0000}{0000}{0000}{0000}{0000};
+ \__fp_fixed_mul_sub_back:wwwn {0000}{0000}{0000}{0001}{5619}{2070};
+ #4;{0000}{0000}{0000}{0477}{9477}{3324};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0000}{0011}{4707}{4559}{7730};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0000}{2087}{6756}{9878}{6810};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0027}{5573}{1922}{3985}{8907};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{2480}{1587}{3015}{8730}{1587};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0013}{8888}{8888}{8888}{8888}{8889};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0416}{6666}{6666}{6666}{6666}{6667};
+ \__fp_fixed_mul_sub_back:wwwn #4;{5000}{0000}{0000}{0000}{0000}{0000};
+ \__fp_fixed_mul_sub_back:wwwn#4;{10000}{0000}{0000}{0000}{0000}{0000};
{ \__fp_fixed_continue:wn 0, }
}
{ % 1/17!
- \__fp_fixed_mul_sub_back:wwwn {0000}{0000}{0000}{0028}{1145}{7254};
- #4; {0000}{0000}{0000}{7647}{1637}{3182};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0000}{0160}{5904}{3836}{8216};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0002}{5052}{1083}{8544}{1719};
- \__fp_fixed_mul_sub_back:wwwn #4; {0000}{0275}{5731}{9223}{9858}{9065};
- \__fp_fixed_mul_sub_back:wwwn #4; {0001}{9841}{2698}{4126}{9841}{2698};
- \__fp_fixed_mul_sub_back:wwwn #4; {0083}{3333}{3333}{3333}{3333}{3333};
- \__fp_fixed_mul_sub_back:wwwn #4; {1666}{6666}{6666}{6666}{6666}{6667};
- \__fp_fixed_mul_sub_back:wwwn #4;{10000}{0000}{0000}{0000}{0000}{0000};
+ \__fp_fixed_mul_sub_back:wwwn {0000}{0000}{0000}{0028}{1145}{7254};
+ #4;{0000}{0000}{0000}{7647}{1637}{3182};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0000}{0160}{5904}{3836}{8216};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0002}{5052}{1083}{8544}{1719};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0000}{0275}{5731}{9223}{9858}{9065};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0001}{9841}{2698}{4126}{9841}{2698};
+ \__fp_fixed_mul_sub_back:wwwn #4;{0083}{3333}{3333}{3333}{3333}{3333};
+ \__fp_fixed_mul_sub_back:wwwn #4;{1666}{6666}{6666}{6666}{6666}{6667};
+ \__fp_fixed_mul_sub_back:wwwn#4;{10000}{0000}{0000}{0000}{0000}{0000};
{ \__fp_ep_mul:wwwwn 0, } #5,#6;
}
{
@@ -14025,12 +14134,12 @@
\__fp_fixed_mul_sub_back:wwwn #3;{10000}{0000}{0000}{0000}{0000}{0000};
{ \__fp_ep_mul:wwwwn 0, } #4,#5;
{
- \__fp_fixed_mul_sub_back:wwwn {0000}{0007}{0258}{0681}{9408}{4706};
- #3; {0000}{2343}{7175}{1399}{6151}{7670};
- \__fp_fixed_mul_sub_back:wwwn #3; {0019}{2638}{4588}{9232}{8861}{3691};
- \__fp_fixed_mul_sub_back:wwwn #3; {0536}{6357}{0691}{4344}{6852}{4252};
- \__fp_fixed_mul_sub_back:wwwn #3; {5263}{1578}{9473}{6842}{1052}{6315};
- \__fp_fixed_mul_sub_back:wwwn #3;{10000}{0000}{0000}{0000}{0000}{0000};
+ \__fp_fixed_mul_sub_back:wwwn {0000}{0007}{0258}{0681}{9408}{4706};
+ #3;{0000}{2343}{7175}{1399}{6151}{7670};
+ \__fp_fixed_mul_sub_back:wwwn #3;{0019}{2638}{4588}{9232}{8861}{3691};
+ \__fp_fixed_mul_sub_back:wwwn #3;{0536}{6357}{0691}{4344}{6852}{4252};
+ \__fp_fixed_mul_sub_back:wwwn #3;{5263}{1578}{9473}{6842}{1052}{6315};
+ \__fp_fixed_mul_sub_back:wwwn#3;{10000}{0000}{0000}{0000}{0000}{0000};
{
\reverse_if:N \if_int_odd:w
\__int_eval:w (#2 - \c_one) / \c_two \__int_eval_end:
@@ -14722,7 +14831,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3box.dtx 4974 2014-05-31 18:28:43Z mittelba $
+\GetIdInfo$Id: l3box.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Experimental boxes}
\cs_new_protected:Npn \box_new:N #1
{
@@ -14754,8 +14863,10 @@
{ \tex_global:D \box_set_eq_clear:NN }
\cs_generate_variant:Nn \box_set_eq_clear:NN { c , Nc , cc }
\cs_generate_variant:Nn \box_gset_eq_clear:NN { c , Nc , cc }
-\prg_new_eq_conditional:NNn \box_if_exist:N \cs_if_exist:N { TF , T , F , p }
-\prg_new_eq_conditional:NNn \box_if_exist:c \cs_if_exist:c { TF , T , F , p }
+\prg_new_eq_conditional:NNn \box_if_exist:N \cs_if_exist:N
+ { TF , T , F , p }
+\prg_new_eq_conditional:NNn \box_if_exist:c \cs_if_exist:c
+ { TF , T , F , p }
\cs_new_eq:NN \box_ht:N \tex_ht:D
\cs_new_eq:NN \box_dp:N \tex_dp:D
\cs_new_eq:NN \box_wd:N \tex_wd:D
@@ -14851,7 +14962,8 @@
\group_end:
}
\cs_new_protected:Npn \hbox:n { \tex_hbox:D \scan_stop: }
-\cs_new_protected:Npn \hbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_hbox:D {#2} }
+\cs_new_protected:Npn \hbox_set:Nn #1#2
+ { \tex_setbox:D #1 \tex_hbox:D {#2} }
\cs_new_protected:Npn \hbox_gset:Nn { \tex_global:D \hbox_set:Nn }
\cs_generate_variant:Nn \hbox_set:Nn { c }
\cs_generate_variant:Nn \hbox_gset:Nn { c }
@@ -14904,7 +15016,10 @@
\cs_generate_variant:Nn \vbox_set_top:Nn { c }
\cs_generate_variant:Nn \vbox_gset_top:Nn { c }
\cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3
- { \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:w #2 \__dim_eval_end: { #3 \par } }
+ {
+ \tex_setbox:D #1 \tex_vbox:D to \__dim_eval:w #2 \__dim_eval_end:
+ { #3 \par }
+ }
\cs_new_protected:Npn \vbox_gset_to_ht:Nnn
{ \tex_global:D \vbox_set_to_ht:Nnn }
\cs_generate_variant:Nn \vbox_set_to_ht:Nnn { c }
@@ -14966,7 +15081,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3coffins.dtx 4899 2014-05-28 20:13:51Z joseph $
+\GetIdInfo$Id: l3coffins.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Coffin code layer}
\box_new:N \l__coffin_internal_box
\dim_new:N \l__coffin_internal_dim
@@ -15079,7 +15194,10 @@
\__coffin_set_pole:Nnx #1 { T }
{
{ 0 pt }
- { \dim_eval:n { \box_ht:N #1 - \box_ht:N \l__coffin_internal_box } }
+ {
+ \dim_eval:n
+ { \box_ht:N #1 - \box_ht:N \l__coffin_internal_box }
+ }
{ 1000 pt }
{ 0 pt }
}
@@ -15125,7 +15243,8 @@
{
{ 0 pt }
{
- \dim_eval:n { \box_ht:N #1 - \box_ht:N \l__coffin_internal_box }
+ \dim_eval:n
+ { \box_ht:N #1 - \box_ht:N \l__coffin_internal_box }
}
{ 1000 pt }
{ 0 pt }
@@ -15353,7 +15472,8 @@
}
}
}
-\cs_new_protected:Npn \__coffin_calculate_intersection_aux:nnnnnN #1#2#3#4#5#6
+\cs_new_protected:Npn \__coffin_calculate_intersection_aux:nnnnnN
+ #1#2#3#4#5#6
{
\dim_set:Nn #6
{
@@ -15382,7 +15502,7 @@
}
\__coffin_reset_structure:N \l__coffin_aligned_coffin
\prop_clear:c
- { l__coffin_corners_ \__int_value:w \l__coffin_aligned_coffin _ prop }
+ { l__coffin_corners_ \__int_value:w \l__coffin_aligned_coffin _ prop }
\__coffin_update_poles:N \l__coffin_aligned_coffin
\dim_compare:nNnTF \l__coffin_offset_x_dim < \c_zero_dim
{
@@ -15791,7 +15911,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3color.dtx 4712 2014-04-30 08:17:49Z joseph $
+\GetIdInfo$Id: l3color.dtx 5354 2014-08-23 01:35:39Z bruno $
{L3 Experimental color support}
\cs_new_eq:NN \color_group_begin: \group_begin:
\cs_new_protected_nopar:Npn \color_group_end:
@@ -15809,7 +15929,10 @@
}
{
\cs_if_exist:NT \set@color
- { \cs_set_protected_nopar:Npn \color_ensure_current: { \set@color } }
+ {
+ \cs_set_protected_nopar:Npn \color_ensure_current:
+ { \set@color }
+ }
}
}
%% File: l3candidates.dtx Copyright(C) 2012-2014 The LaTeX3 Project
@@ -15845,8 +15968,36 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3candidates.dtx 5232 2014-07-18 19:32:54Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 5366 2014-08-24 21:35:03Z bruno $
{L3 Experimental additions to l3kernel}
+\group_begin:
+ \tex_lccode:D `? = `: \scan_stop:
+ \tex_catcode:D `? = 12 \scan_stop:
+\tex_lowercase:D
+ {
+ \group_end:
+ \cs_new_protected:Npn \cs_log:N #1
+ {
+ \__msg_log_wrap:n
+ {
+ > ~ \token_to_str:N #1 =
+ \exp_after:wN \__cs_show:www \cs_meaning:N #1
+ \use_none:nn ? \prg_do_nothing:
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \cs_log:c
+ { \group_begin: \exp_args:NNc \group_end: \cs_log:N }
+\cs_new_protected:Npn \__kernel_register_log:N #1
+ {
+ \cs_if_exist:NTF #1
+ { \__msg_log_value:x { \token_to_str:N #1 = \tex_the:D #1 } }
+ {
+ \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
+ }
+\cs_generate_variant:Nn \__kernel_register_log:N { c }
\fp_new:N \l__box_angle_fp
\fp_new:N \l__box_cos_fp
\fp_new:N \l__box_sin_fp
@@ -16162,7 +16313,10 @@
\dim_compare:nNnTF { \box_ht:N \l__box_internal_box } > {#5}
{
\hbox_set:Nn \l__box_internal_box
- { \box_move_up:nn \c_zero_dim { \box_use:N \l__box_internal_box } }
+ {
+ \box_move_up:nn \c_zero_dim
+ { \box_use:N \l__box_internal_box }
+ }
\box_set_ht:Nn \l__box_internal_box
{ \box_ht:N \l__box_internal_box - (#5) }
}
@@ -16202,7 +16356,10 @@
\dim_compare:nNnTF {#5} > \c_zero_dim
{
\hbox_set:Nn \l__box_internal_box
- { \box_move_up:nn \c_zero_dim { \box_use:N \l__box_internal_box } }
+ {
+ \box_move_up:nn \c_zero_dim
+ { \box_use:N \l__box_internal_box }
+ }
\box_set_ht:Nn \l__box_internal_box
{
#5
@@ -16221,6 +16378,17 @@
\box_set_eq:NN #1 \l__box_internal_box
}
\cs_generate_variant:Nn \box_viewport:Nnnnn { c }
+\cs_new_protected:Npn \clist_log:N #1
+ {
+ \__msg_log_variable:Nnn #1 { clist }
+ { \clist_map_function:NN #1 \__msg_show_item:n }
+ }
+\cs_new_protected:Npn \clist_log:n #1
+ {
+ \clist_set:Nn \l__clist_internal_clist {#1}
+ \clist_log:N \l__clist_internal_clist
+ }
+\cs_generate_variant:Nn \clist_log:N { c }
\fp_new:N \l__coffin_sin_fp
\fp_new:N \l__coffin_cos_fp
\prop_new:N \l__coffin_bounding_prop
@@ -16450,6 +16618,19 @@
{#5} {#6}
}
}
+\cs_new_protected:Npn \coffin_log_structure:N #1
+ {
+ \__coffin_if_exist:NT #1
+ {
+ \__msg_log_variable:Nnn #1 { coffins }
+ {
+ \prop_map_function:cN
+ { l__coffin_poles_ \__int_value:w #1 _prop }
+ \__msg_show_item_unbraced:nn
+ }
+ }
+ }
+\cs_generate_variant:Nn \coffin_log_structure:N { c }
\cs_new_protected:Npn \file_if_exist_input:n #1
{
\file_if_exist:nT {#1}
@@ -16507,6 +16688,85 @@
}
}
\tl_new:N \l__ior_internal_tl
+\cs_new_protected_nopar:Npn \ior_log_streams:
+ { \__ior_log_streams:Nn \g__ior_streams_prop { input } }
+\cs_new_protected:Npn \__ior_log_streams:Nn #1#2
+ {
+ \__msg_log:nnn { LaTeX / kernel }
+ { \prop_if_empty:NTF #1 { show-no-stream } { show-open-streams } }
+ {#2}
+ \__msg_log_wrap:n
+ { \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
+ }
+\cs_new_protected_nopar:Npn \iow_log_streams:
+ { \__iow_log_streams:Nn \g__iow_streams_prop { output } }
+\cs_new_protected:Npn \__iow_log_streams:Nn #1#2
+ {
+ \__msg_log:nnn { LaTeX / kernel }
+ { \prop_if_empty:NTF #1 { show-no-stream } { show-open-streams } }
+ {#2}
+ \__msg_log_wrap:n
+ { \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
+ }
+\cs_new_protected:Npn \fp_log:N #1
+ {
+ \fp_if_exist:NTF #1
+ { \__msg_log_value:x { \token_to_str:N #1 = \fp_to_tl:N #1 } }
+ {
+ \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
+ }
+\cs_new_protected:Npn \fp_log:n #1
+ { \__msg_log_value:x { \fp_to_tl:n {#1} } }
+\cs_generate_variant:Nn \fp_log:N { c }
+\cs_new_eq:NN \int_log:N \__kernel_register_log:N
+\cs_new_eq:NN \int_log:c \__kernel_register_log:c
+\cs_new_protected:Npn \int_log:n #1
+ { \__msg_log_value:x { \int_eval:n {#1} } }
+\cs_new_protected:Npn \keys_log:nn #1#2
+ { \cs_log:c { \c__keys_code_root_tl #1 / \tl_to_str:n {#2} } }
+\cs_new_protected:Npn \__msg_log:nnn #1#2#3
+ {
+ \iow_wrap:nnnN
+ { \use:c { \c__msg_text_prefix_tl #1 / #2 } {#3} { } { } { } }
+ { } { } \iow_log:n
+ }
+\cs_new_protected:Npn \__msg_log_variable:Nnn #1#2#3
+ {
+ \cs_if_exist:NTF #1
+ {
+ \__msg_log:nnn { LaTeX / kernel } { show- #2 } {#1}
+ \__msg_log_wrap:n {#3}
+ }
+ {
+ \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
+ }
+\cs_new_protected:Npn \__msg_log_wrap:n #1
+ { \iow_wrap:nnnN { #1 . } { } { } \__msg_log:n }
+\cs_new_protected:Npn \__msg_log:n #1
+ { \iow_log:x { \tl_if_single:nT {#1} { > ~ } #1 } }
+\cs_new_protected:Npn \__msg_log_value:n #1
+ { \iow_log:n { >~ #1 . } }
+\cs_generate_variant:Nn \__msg_log_value:n { x }
+\cs_new_protected:Npn \bool_log:N #1
+ {
+ \bool_if_exist:NTF #1
+ {
+ \__msg_log_value:x
+ { \token_to_str:N #1 = \__bool_to_word:n {#1} }
+ }
+ {
+ \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
+ }
+\cs_new_protected:Npn \bool_log:n #1
+ { \__msg_log_value:x { \__bool_to_word:n {#1} } }
+\cs_new:Npn \__bool_to_word:n #1 { \bool_if:nTF {#1} { true } { false } }
+\cs_generate_variant:Nn \bool_log:N { c }
\cs_new:Npn \prop_map_tokens:Nn #1#2
{
\exp_last_unbraced:Nno \__prop_map_tokens:nwwn {#2} #1
@@ -16522,6 +16782,12 @@
\__prop_map_tokens:nwwn {#1}
}
\cs_generate_variant:Nn \prop_map_tokens:Nn { c }
+\cs_new_protected:Npn \prop_log:N #1
+ {
+ \__msg_log_variable:Nnn #1 { prop }
+ { \prop_map_function:NN #1 \__msg_show_item:nn }
+ }
+\cs_generate_variant:Nn \prop_log:N { c }
\cs_new:Npn \seq_mapthread_function:NNN #1#2#3
{ \exp_after:wN \__seq_mapthread_function:wNN #2 \q_stop #1 #3 }
\cs_new:Npn \__seq_mapthread_function:wNN \s__seq #1 \q_stop #2#3
@@ -16565,6 +16831,12 @@
#1 #2 { #3 }
\__seq_pop_item_def:
}
+\cs_new_protected:Npn \seq_log:N #1
+ {
+ \__msg_log_variable:Nnn #1 { seq }
+ { \seq_map_function:NN #1 \__msg_show_item:n }
+ }
+\cs_generate_variant:Nn \seq_log:N { c }
\cs_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
{
\skip_if_finite:nTF {#1}
@@ -16578,11 +16850,27 @@
#2
}
}
+\cs_new_eq:NN \dim_log:N \__kernel_register_log:N
+\cs_new_eq:NN \dim_log:c \__kernel_register_log:c
+\cs_new_protected:Npn \dim_log:n #1
+ { \__msg_log_value:x { \dim_eval:n {#1} } }
+\cs_new_eq:NN \skip_log:N \__kernel_register_log:N
+\cs_new_eq:NN \skip_log:c \__kernel_register_log:c
+\cs_new_protected:Npn \skip_log:n #1
+ { \__msg_log_value:x { \skip_eval:n {#1} } }
+\cs_new_eq:NN \muskip_log:N \__kernel_register_log:N
+\cs_new_eq:NN \muskip_log:c \__kernel_register_log:c
+\cs_new_protected:Npn \muskip_log:n #1
+ { \__msg_log_value:x { \muskip_eval:n {#1} } }
\prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF }
{
\tl_if_head_is_N_type:nTF {#1}
- { \__str_if_eq_x_return:nn { \exp_not:o { \use_none:n #1 } } { } }
- { \__str_if_eq_x_return:nn { \exp_not:n {#1} } { ~ } }
+ { \__tl_if_empty_return:o { \use_none:n #1 } }
+ {
+ \tl_if_empty:nTF {#1}
+ { \prg_return_false: }
+ { \__tl_if_empty_return:o { \tex_romannumeral:D -`0 #1 } }
+ }
}
\cs_new:Npn \tl_reverse_tokens:n #1
{
@@ -16669,7 +16957,10 @@
\cs_new:Npn \__tl_act_case_group:nn #1 #2
{
\exp_after:wN \__tl_act_output:n \exp_after:wN
- { \exp_after:wN { \tex_romannumeral:D \__tl_act_case_aux:nn {#1} {#2} } }
+ {
+ \exp_after:wN
+ { \tex_romannumeral:D \__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 }
@@ -16770,7 +17061,7 @@
\cs_new:Npn \__tl_change_case_char:NNNNNNNNn #1#2#3#4#5#6#7#8#9
{
\exp_args:NNv \str_case:nnF #8
- { c__tl_ #9 _ #6 _ #7 _tl }
+ { c__tl_ #9 _ #6 _X_ #7 _tl }
{ \exp_not:N #8 }
}
\cs_new:Npn \__tl_change_case_lower_sigma:Nnn #1#2
@@ -16836,12 +17127,14 @@
#1 {#2}
{
\exp_after:wN \__tl_mixed_case_skip:Nwn \exp_after:wN #1
- \c__tl_mixed_skip_clist , \q_recursion_tail , \q_recursion_stop
+ \c__tl_mixed_skip_clist , \q_recursion_tail ,
+ \q_recursion_stop
{
\exp_args:NNV \str_case:nnF #1 \c__tl_mixed_exceptions_tl
{
\exp_after:wN \__tl_change_case_char:NNNNNNNNn
- \int_use:N \__int_eval:w 1000000 + `#1 \__int_eval_end:
+ \int_use:N
+ \__int_eval:w 1000000 + `#1 \__int_eval_end:
#1 { upper }
}
}
@@ -16991,6 +17284,18 @@
\use_i:nn
}
}
+\cs_new_protected:Npn \tl_log:N #1
+ {
+ \tl_if_exist:NTF #1
+ { \cs_log:N #1 }
+ {
+ \__msg_kernel_error:nnx { kernel } { variable-not-defined }
+ { \token_to_str:N #1 }
+ }
+ }
+\cs_generate_variant:Nn \tl_log:N { c }
+\cs_new_protected:Npn \tl_log:n #1
+ { \__msg_log_wrap:n { > ~ \tl_to_str:n {#1} } }
\group_begin:
\char_set_catcode_active:N \^^@
\cs_set:Npn \char_tmp:NN #1#2
@@ -17049,9 +17354,9 @@
\cs_new_protected_nopar:Npn \peek_N_type:TF
{ \__peek_token_generic:NNTF \__peek_execute_branches_N_type: \scan_stop: }
\cs_new_protected_nopar:Npn \peek_N_type:T
- { \__peek_token_generic:NNT \__peek_execute_branches_N_type: \scan_stop: }
+ { \__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: }
+ { \__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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index db6ef6f3371..237dea6613b 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{2014/07/20}
-\def\ExplFileVersion{5241}
+\def\ExplFileDate{2014/08/25}
+\def\ExplFileVersion{5378}
\let\ExplLoaderFileVersion\ExplFileVersion
\begingroup
\def\tempa{LaTeX2e}
@@ -57,7 +57,7 @@
\def\next
{%
\PackageInfo{expl3}{Switching from generic to LaTeX2e loader}
- \endinput \RequirePackage{expl3}
+ \RequirePackage{expl3} \relax \endinput
}
\fi
\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index e1b4fd7100f..cce7edf339b 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{2014/07/20}
-\def\ExplFileVersion{5241}
+\def\ExplFileDate{2014/08/25}
+\def\ExplFileVersion{5378}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
@@ -238,7 +238,7 @@
\ProvidesFile {#1} [ #2~v#3~#4 ]
}
\@onefilewithoptions { l3unicode-data } [ ] [ ] \c__expl_def_ext_tl
-\str_if_eq:nVTF { latex2e } \l__expl_driver_tl
+\str_if_eq:VnTF \l__expl_driver_tl { latex2e }
{
\tl_gput_left:Nn \@begindocumenthook { \RequirePackage { graphics } }
\__msg_kernel_new:nnnn { box } { clipping-not-available }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 68d8ada8b0f..f4467321a8f 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 5204 2014-07-15 09:56:33Z mittelba $
+\GetIdInfo$Id: l3doc.dtx 5353 2014-08-23 01:23:51Z bruno $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -58,62 +58,169 @@
\let \ExplFileDate \filedateOld
\let \ExplFileVersion \fileversionOld
\let \ExplFileDescription \filedescriptionOld
-\coffin_new:N \l__codedoc_output_box
+\cs_generate_variant:Nn \tl_count:n { f }
+\cs_generate_variant:Nn \tl_greplace_all:Nnn { Nx }
+\cs_generate_variant:Nn \tl_if_head_eq_charcode:nNTF { o }
+\cs_generate_variant:Nn \tl_if_head_eq_charcode:nNT { o }
+\cs_generate_variant:Nn \tl_if_head_eq_charcode:nNF { o }
+\cs_generate_variant:Nn \tl_if_in:NnTF { No }
+\cs_generate_variant:Nn \tl_if_in:NnT { No }
+\cs_generate_variant:Nn \tl_if_in:NnF { No }
+\cs_generate_variant:Nn \tl_remove_all:Nn { Nx }
+\cs_generate_variant:Nn \tl_replace_all:Nnn { Nx , Nnx, No , Nno }
+\cs_generate_variant:Nn \tl_replace_once:Nnn { Noo }
+\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
+\cs_generate_variant:Nn \prop_put:Nnn { Nx }
+\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
+\cs_new_protected:Npn \__codedoc_replace_at_at:N #1
+ {
+ \tl_if_empty:NF \g__codedoc_module_name_tl
+ {
+ \exp_args:NNo \__codedoc_replace_at_at_aux:Nn
+ #1 \g__codedoc_module_name_tl
+ }
+ }
+\cs_new_protected:Npn \__codedoc_replace_at_at_aux:Nn #1#2
+ {
+ \tl_replace_all:Non #1 { \token_to_str:N @ } { @ }
+ \tl_replace_all:Non #1 { \token_to_str:N _ } { _ }
+ \tl_replace_all:Nnn #1 { _ @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { @ @ } { _ _ #2 }
+ }
+\cs_new_protected:Npn \__codedoc_verb_get_seq:nN #1#2
+ {
+ \tl_set:Nx \l__codedoc_tmpa_tl { \tl_to_str:n {#1} }
+ \tl_remove_all:Nx \l__codedoc_tmpa_tl
+ { \iow_char:N \^^M \iow_char:N \% }
+ \tl_remove_all:Nx \l__codedoc_tmpa_tl { \tl_to_str:n { ^ ^ A } }
+ \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^I }
+ \tl_remove_all:Nx \l__codedoc_tmpa_tl { \iow_char:N \^^M }
+ \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
+ \exp_args:NNx \seq_set_from_clist:Nn #2
+ { \tl_to_str:N \l__codedoc_tmpa_tl }
+ }
+\cs_new:Npn \__codedoc_signature_base_form:n #1
+ { \__codedoc_signature_base_form_aux:n #1 \c_empty_tl }
+\cs_new:Npn \__codedoc_signature_base_form_aux:n #1
+ {
+ \str_case:nnTF {#1}
+ {
+ { N } { N }
+ { c } { N }
+ { n } { n }
+ { o } { n }
+ { f } { n }
+ { x } { n }
+ { V } { n }
+ { v } { n }
+ }
+ { \__codedoc_signature_base_form_aux:n }
+ {#1}
+ }
+\cs_new:Npn \__codedoc_predicate_from_base:N #1
+ {
+ \__cs_get_function_name:N #1 _p:
+ \__cs_get_function_signature:N #1
+ }
+\cs_new_protected:Npn \CodedocUseCs #1 { \use:c { \tl_to_str:n {#1} } }
+\cs_new:Npn \CodedocUnexpandedTokens #1 #
+ { \use:c { CodedocUnexpandedTokens ~ } \__codedoc_exp_not:n }
+\cs_new_protected:cpn { CodedocUnexpandedTokens ~ } #1#2 {#2}
+\cs_new:Npn \__codedoc_exp_not:n #1 { \exp_not:n { \__codedoc_exp_not:n {#1} } }
+\clist_new:N \g_docinput_clist
+\seq_new:N \g_doc_functions_seq
+\seq_new:N \g_doc_macros_seq
+\coffin_new:N \l__codedoc_output_coffin
\coffin_new:N \l__codedoc_names_coffin
\coffin_new:N \l__codedoc_descr_coffin
\coffin_new:N \l__codedoc_syntax_coffin
\box_new:N \g__codedoc_syntax_box
\bool_new:N \l__codedoc_long_name_bool
-\bool_new:N \g__codedoc_implementation_bool
\dim_new:N \l__codedoc_trial_width_dim
-\tl_new:N \l__codedoc_macro_tl
-\int_new:N \l__codedoc_macro_int
-\int_new:N \g__codedoc_nested_macro_int
+\int_new:N \l__codedoc_nested_macro_int
+\bool_new:N \l__codedoc_macro_tested_bool
\prop_new:N \g__codedoc_missing_tests_prop
-\clist_new:N \g_docinput_clist
-\tl_new:N \l__codedoc_at_replaced_macro_tl
-\seq_new:N \g__codedoc_testfiles_seq
-\seq_new:N \g_doc_functions_seq
-\seq_new:N \g_doc_macros_seq
\seq_new:N \g__codedoc_not_tested_seq
-\bool_new:N \l__codedoc_meta_TF_bool
-\bool_new:N \l__codedoc_meta_pTF_bool
-\bool_new:N \l__codedoc_meta_EXP_bool
-\bool_new:N \l__codedoc_meta_rEXP_bool
+\seq_new:N \g__codedoc_testfiles_seq
\bool_new:N \l__codedoc_macro_internal_bool
\bool_new:N \l__codedoc_macro_aux_bool
\bool_new:N \l__codedoc_macro_TF_bool
\bool_new:N \l__codedoc_macro_pTF_bool
+\bool_new:N \l__codedoc_macro_EXP_bool
+\bool_new:N \l__codedoc_macro_rEXP_bool
\bool_new:N \l__codedoc_macro_var_bool
-\bool_new:N \g__codedoc_full_bool
\bool_new:N \g__codedoc_lmodern_bool
\bool_new:N \g__codedoc_checkfunc_bool
\bool_new:N \g__codedoc_checktest_bool
-\seq_new:N \g__codedoc_tmpa_seq
\tl_new:N \l__codedoc_tmpa_tl
\tl_new:N \l__codedoc_tmpb_tl
\int_new:N \l__codedoc_tmpa_int
-\bool_new:N \l__codedoc_tested_bool
-\DeclareOption{a5paper}{\@latexerr{Option not supported}{}}
-\DeclareOption{full}{ \bool_set_true:N \g__codedoc_full_bool }
-\DeclareOption{onlydoc}{ \bool_set_false:N \g__codedoc_full_bool }
-\DeclareOption{check}{ \bool_set_true:N \g__codedoc_checkfunc_bool }
-\DeclareOption{nocheck}{ \bool_set_false:N \g__codedoc_checkfunc_bool }
-\DeclareOption{checktest}{ \bool_set_true:N \g__codedoc_checktest_bool }
-\DeclareOption{nochecktest}{ \bool_set_false:N \g__codedoc_checktest_bool }
-\DeclareOption{cm-default}{ \bool_set_false:N \g__codedoc_lmodern_bool }
-\DeclareOption{lm-default}{ \bool_set_true:N \g__codedoc_lmodern_bool }
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ExecuteOptions{full,a4paper,nocheck,nochecktest,lm-default}
-\msg_new:nnn {l3doc} {input-cfg}
- {
- Local~config~file~l3doc.cfg~loaded.
- }
-\file_if_exist:nT {l3doc.cfg}
- {
- \file_input:n {l3doc.cfg}
- \msg_info:nn {l3doc} {input-cfg}
- }
+\prop_new:N \l__codedoc_functions_block_prop
+\seq_new:N \l__codedoc_function_input_seq
+\seq_new:N \l__codedoc_macro_input_seq
+\tl_const:Nx \c__codedoc_backslash_tl { \iow_char:N \\ }
+\exp_last_unbraced:NNo
+ \cs_new_eq:NN \c__codedoc_backslash_token { \c__codedoc_backslash_tl }
+\tl_new:N \g__codedoc_function_name_prefix_tl
+\tl_new:N \l__codedoc_index_macro_tl
+\tl_new:N \l__codedoc_index_key_tl
+\tl_new:N \l__codedoc_index_module_tl
+\tl_new:N \g__codedoc_module_name_tl
+\tl_const:Nn \c__codedoc_iow_rule_tl
+ { ======================================== }
+\tl_const:Nn \c__codedoc_iow_mid_rule_tl
+ { -------------------------------------- }
+\box_new:N \l__codedoc_macro_index_box
+\box_new:N \l__codedoc_macro_box
+\int_new:N \l__codedoc_macro_int
+\tl_new:N \l__codedoc_cmd_tl
+\tl_new:N \l__codedoc_cmd_index_tl
+\bool_new:N \l__codedoc_cmd_replace_bool
+\bool_new:N \l__codedoc_in_implementation_bool
+\bool_new:N \g__codedoc_typeset_documentation_bool
+\bool_new:N \g__codedoc_typeset_implementation_bool
+\bool_set_true:N \g__codedoc_typeset_documentation_bool
+\bool_set_true:N \g__codedoc_typeset_implementation_bool
+\tl_new:N \g__codedoc_base_name_tl
+\prop_new:N \l__codedoc_variants_prop
+\bool_new:N \l__codedoc_no_label_bool
+\cs_new_eq:NN \__codedoc_tmpa:w ?
+\cs_new_eq:NN \__codedoc_tmpb:w ?
+\DeclareOption { a5paper } { \@latexerr { Option~not~supported } { } }
+\DeclareOption { full }
+ {
+ \bool_gset_true:N \g__codedoc_typeset_documentation_bool
+ \bool_gset_true:N \g__codedoc_typeset_implementation_bool
+ }
+\DeclareOption { onlydoc }
+ {
+ \bool_gset_true:N \g__codedoc_typeset_documentation_bool
+ \bool_gset_false:N \g__codedoc_typeset_implementation_bool
+ }
+\DeclareOption { check }
+ { \bool_gset_true:N \g__codedoc_checkfunc_bool }
+\DeclareOption { nocheck }
+ { \bool_gset_false:N \g__codedoc_checkfunc_bool }
+\DeclareOption { checktest }
+ { \bool_gset_true:N \g__codedoc_checktest_bool }
+\DeclareOption { nochecktest }
+ { \bool_gset_false:N \g__codedoc_checktest_bool }
+\DeclareOption { cm-default }
+ { \bool_gset_false:N \g__codedoc_lmodern_bool }
+\DeclareOption { lm-default }
+ { \bool_gset_true:N \g__codedoc_lmodern_bool }
+\DeclareOption* { \PassOptionsToClass { \CurrentOption } { article } }
+\ExecuteOptions { full, a4paper, nocheck, nochecktest, lm-default }
+\msg_new:nnn { l3doc } { input-cfg }
+ { Local~config~file~l3doc.cfg~loaded. }
+\file_if_exist:nT { l3doc.cfg }
+ {
+ \file_input:nT { l3doc.cfg }
+ {
+ \cs_if_exist:cF { ExplMakeTitle }
+ { \msg_info:nn { l3doc } { input-cfg } }
+ }
+ }
\ProcessOptions
\LoadClass{article}
\RequirePackage{doc}
@@ -138,862 +245,1158 @@
verbatim
}
\raggedbottom
-\fvset{gobble=2}
-\cs_set_eq:NN \verbatim \Verbatim
-\cs_set_eq:NN \endverbatim \endVerbatim
\bool_if:NT \g__codedoc_lmodern_bool
- {
- \RequirePackage[T1]{fontenc}
- \RequirePackage{lmodern}
- \group_begin:
- \ttfamily
- \DeclareFontShape{T1}{lmtt}{m}{it}{<->ec-lmtto10}{}
- \group_end:
- }
+ {
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{lmodern}
+ \group_begin:
+ \ttfamily
+ \DeclareFontShape{T1}{lmtt}{m}{it}{<->ec-lmtto10}{}
+ \group_end:
+ }
\RequirePackage{hypdoc}
-\cs_set_nopar:Npn \MakePrivateLetters
- {
- \char_set_catcode_letter:N \@
- \char_set_catcode_letter:N \_
- \char_set_catcode_letter:N \:
- }
+\cs_gset_nopar:Npn \MakePrivateLetters
+ {
+ \char_set_catcode_letter:N \@
+ \char_set_catcode_letter:N \_
+ \char_set_catcode_letter:N \:
+ }
\setcounter{StandardModuleDepth}{1}
\@addtoreset{CodelineNo}{part}
\tl_replace_once:Nnn \theCodelineNo
- { \HDorg@theCodelineNo }
- { \textcolor[gray]{0.5} { \sffamily\tiny\arabic{CodelineNo} } }
+ { \HDorg@theCodelineNo }
+ { \textcolor[gray]{0.5} { \sffamily\tiny\arabic{CodelineNo} } }
+\fvset{gobble=2}
+\cs_gset_eq:NN \verbatim \Verbatim
+\cs_gset_eq:NN \endverbatim \endVerbatim
\setlength \textwidth { 385pt }
\addtolength \marginparwidth { 30pt }
\addtolength \oddsidemargin { 20pt }
\addtolength \evensidemargin { 20pt }
-\cs_set_eq:NN \__codedoc_oldlist:nn \list
-\cs_set_nopar:Npn \list #1 #2 { \__codedoc_oldlist:nn {#1} { #2 \listparindent\z@ } }
+\cs_new_eq:NN \__codedoc_oldlist:nn \list
+\cs_gset_nopar:Npn \list #1 #2
+ { \__codedoc_oldlist:nn {#1} { #2 \dim_zero:N \listparindent } }
\setlength \parindent { 2em }
\setlength \itemindent { 0pt }
\setlength \parskip { 0pt plus 3pt minus 0pt }
+\tl_gset:Nn \partname {File}
\@addtoreset{section}{part}
-\cs_set_nopar:Npn \l@section #1#2
- {
- \ifnum \c@tocdepth >\z@
- \addpenalty\@secpenalty
- \addvspace{1.0em \@plus\p@}
- \setlength\@tempdima{2.5em} % was 1.5em
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \leavevmode \bfseries
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
- \endgroup
- \fi
- }
-\cs_set_nopar:Npn\l@subsection{\@dottedtocline{2}{2.5em}{2.3em}} % #2 = 1.5em
+\cs_gset_nopar:Npn \l@section #1#2
+ {
+ \ifnum \c@tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1.0em \@plus\p@}
+ \setlength\@tempdima{2.5em} % was 1.5em
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \leavevmode \bfseries
+ \advance\leftskip\@tempdima
+ \hskip -\leftskip
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \endgroup
+ \fi
+ }
+\cs_gset_nopar:Npn \l@subsection
+ { \@dottedtocline{2}{2.5em}{2.3em} } % #2 = 1.5em
\AtBeginDocument
- {
- \MakeShortVerb \"
- \MakeShortVerb \|
- }
+ {
+ \MakeShortVerb \"
+ \MakeShortVerb \|
+ }
+\AtEndDocument
+ {
+ \DeleteShortVerb \"
+ \DeleteShortVerb \|
+ }
\providecommand*\eTeX{\hologo{eTeX}}
\providecommand*\IniTeX{\hologo{iniTeX}}
\providecommand*\Lua{Lua}
\providecommand*\LuaTeX{\hologo{LuaTeX}}
\providecommand*\pdfTeX{\hologo{pdfTeX}}
\providecommand*\XeTeX{\hologo{XeTeX}}
-\DeclareDocumentCommand \cmd {m} { \__codedoc_cmd:n { #1 } }
-\DeclareDocumentCommand \cs {m} { \__codedoc_cs:n { #1 } }
-\cs_new:Npn \__codedoc_cmd:n #1 { \cs{ \expandafter \__codedoc_cmd_to_cs:w \string#1 } }
-\cs_set_nopar:Npn \__codedoc_cmd_to_cs:w #1#2 { \char\number`#2\relax }
-\cs_new:Npn \__codedoc_cs:n #1
- {
- \tl_set_rescan:Nnn \l__codedoc_tmpb_tl { } { _ }
- \tl_set:Nn \l__codedoc_tmpa_tl {#1}
- \tl_replace_all:NVn \l__codedoc_tmpa_tl \l__codedoc_tmpb_tl { _ }
- \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
- \tl_replace_all:NnV \l__codedoc_tmpa_tl { _ } \l__codedoc_tmpb_tl
- \texttt { \char`\\ \tl_use:N \l__codedoc_tmpa_tl}
- }
-\cs_generate_variant:Nn \tl_replace_all:Nnn { NV , NnV }
-\providecommand\marg[1]{ \texttt{\char`\{} \meta{#1} \texttt{\char`\}} }
+\DeclareExpandableDocumentCommand \cmd { O{} m }
+ { \__codedoc_cmd:no {#1} { \token_to_str:N #2 } }
+\DeclareExpandableDocumentCommand \cs { O{} m }
+ { \__codedoc_cmd:no {#1} { \c__codedoc_backslash_tl #2 } }
+\DeclareExpandableDocumentCommand \tn { O{} m }
+ {
+ \__codedoc_cmd:no
+ { index = TeX , replace = false , #1 }
+ { \c__codedoc_backslash_tl #2 }
+ }
+\DeclareExpandableDocumentCommand { \meta } { m }
+ { \__codedoc_meta:n {#1} }
+\newcommand\Arg[1]
+ { \texttt{\char`\{} \meta{#1} \texttt{\char`\}} }
+\providecommand\marg[1]{ \Arg{#1} }
\providecommand\oarg[1]{ \texttt[ \meta{#1} \texttt] }
\providecommand\parg[1]{ \texttt( \meta{#1} \texttt) }
-\cs_set_eq:NN \file \nolinkurl
+\DeclareRobustCommand \file {\nolinkurl}
\DeclareRobustCommand \env {\texttt}
\DeclareRobustCommand \pkg {\textsf}
\DeclareRobustCommand \cls {\textsf}
-\newenvironment{texnote}
- {
- \endgraf
- \vspace{3mm}
- \small\textbf{\TeX~hackers~note:}
- }
- {
- \vspace{3mm}
- }
-\DeclareDocumentCommand \tn {m}
- {
- \texttt { \char`\\ #1 }
- \index
- {
- TeX~and~LaTeX2e~commands\actualchar
- \string\TeX{}~and~\string\LaTeXe{}~commands:\levelchar
- #1\actualchar{\string\ttfamily\string\bslash{}#1}
- }
- }
-\cs_new:Npn \__codedoc_implementation:
- {
- \DeclareDocumentCommand {\variable} { O{} } { \__codedoc_macro:n { var , ##1 } }
- \cs_set_eq:NN \endvariable \endmacro
- }
-\cs_new:Npn \__codedoc_docu:
- {
- \cs_set_eq:NN \variable \variabledoc
- \cs_set_eq:NN \endvariable \endvariabledoc
- }
-\AtEndOfPackage{\__codedoc_docu:}
-\newenvironment{documentation}{\__codedoc_docu:}{}
-\newenvironment{implementation}{\__codedoc_implementation:}{}
-\NewDocumentCommand \EnableDocumentation {}
- {
- \renewenvironment{documentation}{\__codedoc_docu:}{}
- }
-\NewDocumentCommand \EnableImplementation {}
- {
- \renewenvironment{implementation}{\__codedoc_implementation:}{}
- }
-\NewDocumentCommand \DisableDocumentation {}
- {
- \cs_set_eq:NN \documentation \comment
- \cs_set_eq:NN \enddocumentation \endcomment
- }
-\NewDocumentCommand \DisableImplementation {}
- {
- \cs_set_eq:NN \implementation \comment
- \cs_set_eq:NN \endimplementation \endcomment
- }
-\newenvironment{arguments}
- {
- \enumerate[
- nolistsep,
- label=\texttt{\#\arabic*}~:,
- labelsep=*,
- ]
- }
- {
- \endenumerate
- }
-\keys_define:nn { l3doc/function }
- {
- TF .code:n =
- {
- \bool_gset_true:N \l__codedoc_meta_TF_bool
- } ,
- EXP .code:n =
- {
- \bool_gset_true:N \l__codedoc_meta_EXP_bool
- \bool_gset_false:N \l__codedoc_meta_rEXP_bool
- } ,
- rEXP .code:n =
- {
- \bool_gset_false:N \l__codedoc_meta_EXP_bool
- \bool_gset_true:N \l__codedoc_meta_rEXP_bool
- } ,
- pTF .code:n =
- {
- \bool_gset_true:N \l__codedoc_meta_pTF_bool
- \bool_gset_true:N \l__codedoc_meta_TF_bool
- \bool_gset_true:N \l__codedoc_meta_EXP_bool
- } ,
- added .tl_set:N = \l__codedoc_date_added_tl ,
- updated .tl_set:N = \l__codedoc_date_updated_tl ,
- tested .code:n = { } ,
- }
-\char_set_catcode_active:N \<
-\DeclareDocumentEnvironment {function} { O{} }
- {
-
- \par\bigskip\noindent
- \phantomsection
-
- \coffin_clear:N \l__codedoc_descr_coffin
- \box_gclear:N \g__codedoc_syntax_box
- \coffin_clear:N \l__codedoc_syntax_coffin
- \coffin_clear:N \l__codedoc_names_coffin
-
- \bool_set_false:N \l__codedoc_meta_TF_bool
- \bool_set_false:N \l__codedoc_meta_pTF_bool
- \bool_set_false:N \l__codedoc_meta_EXP_bool
- \bool_set_false:N \l__codedoc_meta_rEXP_bool
-
- \keys_set:nn { l3doc/function } {#1}
-
- \char_set_active_eq:NN < \__codedoc_open_meta:w
-
- \group_begin:
- \MakePrivateLetters
- \char_set_catcode_other:N \|
- \char_set_catcode_space:N \~
- \char_set_catcode_ignore:N \ % space
- \char_set_catcode_ignore:N \^^M
- \char_set_catcode_ignore:N \^^I
- \exp_after:wN
- \group_end:
- \__codedoc_function:n
- }
- {
- \vcoffin_set_end:
- \hcoffin_set:Nn \l__codedoc_syntax_coffin { \box_use:N \g__codedoc_syntax_box }
- \bool_if:NTF \l__codedoc_long_name_bool
- {
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {hc} {vc}
- \l__codedoc_syntax_coffin {l} {T}
- {0pt} {0pt}
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {l} {t}
- \l__codedoc_names_coffin {r} {t}
- {-\marginparsep} {0pt}
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {l} {b}
- \l__codedoc_descr_coffin {l} {t}
- {0.75\marginparwidth + \marginparsep} {-\medskipamount}
-
- \coffin_typeset:Nnnnn \l__codedoc_output_box {\l__codedoc_descr_coffin-l} {\l__codedoc_descr_coffin-t} {0pt} {0pt}
- }
- {
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {hc} {vc}
- \l__codedoc_syntax_coffin {l} {t}
- {0pt} {0pt}
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {l} {b}
- \l__codedoc_descr_coffin {l} {t}
- {0pt} {-\medskipamount}
- \coffin_join:NnnNnnnn
- \l__codedoc_output_box {l} {t}
- \l__codedoc_names_coffin {r} {t}
- {-\marginparsep} {0pt}
-
- \coffin_typeset:Nnnnn
- \l__codedoc_output_box {\l__codedoc_syntax_coffin-l} {\l__codedoc_syntax_coffin-T}
- {0pt} {0pt}
- }
- \par
- \allowbreak
- }
-\char_set_catcode_other:N \<
-\cs_set_eq:NN \variabledoc \function
-\cs_set_eq:NN \endvariabledoc \endfunction
-\cs_set_nopar:Npn \__codedoc_function:n #1
- {
-
- \tl_set:Nn \l__codedoc_function_input_tl {#1}
-
- \dim_zero:N \l__codedoc_trial_width_dim
- \hcoffin_set:Nn \l__codedoc_names_coffin { \function_typeset:n {#1} }
- \dim_set:Nn \l__codedoc_trial_width_dim { \box_wd:N \l__codedoc_names_coffin }
-
- \bool_set:Nn \l__codedoc_long_name_bool
- { \dim_compare_p:nNn \l__codedoc_trial_width_dim > \marginparwidth }
-
- \vcoffin_set:Nnw \l__codedoc_descr_coffin {\textwidth}
- \noindent\ignorespaces
- }
-\cs_gset_nopar:Npn \function_typeset:n #1 %^^A todo: use "\cs_new:Npn" here
- {
- \tl_gclear:N \g__codedoc_macro_tl
-
- % populate "\l__codedoc_functions_block_prop" with info on the functions present:
- % with a hack as we don't currently read verbatim and that means that
- % \q_recursion_tail is an issue!
- \str_if_eq:nnTF {#1} { \q_recursion_tail }
+\NewDocumentCommand \EnableDocumentation { }
+ { \bool_gset_true:N \g__codedoc_typeset_documentation_bool }
+\NewDocumentCommand \EnableImplementation { }
+ { \bool_gset_true:N \g__codedoc_typeset_implementation_bool }
+\NewDocumentCommand \DisableDocumentation { }
+ { \bool_gset_false:N \g__codedoc_typeset_documentation_bool }
+\NewDocumentCommand \DisableImplementation { }
+ { \bool_gset_false:N \g__codedoc_typeset_implementation_bool }
+\NewDocumentEnvironment { documentation } { }
+ {
+ \bool_if:NTF \g__codedoc_typeset_documentation_bool
+ { \bool_set_false:N \l__codedoc_in_implementation_bool }
+ { \comment }
+ }
+ { \bool_if:NF \g__codedoc_typeset_documentation_bool { \endcomment } }
+\NewDocumentEnvironment { implementation } { }
+ {
+ \bool_if:NTF \g__codedoc_typeset_implementation_bool
+ { \bool_set_true:N \l__codedoc_in_implementation_bool }
+ { \comment }
+ }
+ { \bool_if:NF \g__codedoc_typeset_implementation_bool { \endcomment } }
+\DeclareDocumentEnvironment { variable } { O{} +v }
+ {
+ \bool_if:NTF \l__codedoc_in_implementation_bool
+ { \__codedoc_macro:nnw { var , #1 } {#2} }
+ { \__codedoc_function:nnw {#1} {#2} }
+ }
+ {
+ \bool_if:NTF \l__codedoc_in_implementation_bool
+ { \__codedoc_macro_end: }
+ { \__codedoc_function_end: }
+ }
+\DeclareDocumentEnvironment { function } { O{} +v }
+ { \__codedoc_function:nnw {#1} {#2} }
+ { \__codedoc_function_end: }
+\DeclareDocumentEnvironment { macro } { O{} +v }
+ { \__codedoc_macro:nnw {#1} {#2} }
+ { \__codedoc_macro_end: }
+\NewDocumentEnvironment { syntax } { }
+ { \__codedoc_syntax:w }
+ {
+ \__codedoc_syntax_end:
+ \ignorespacesafterend
+ }
+\NewDocumentEnvironment { texnote } { }
+ {
+ \endgraf
+ \vspace{3mm}
+ \small\textbf{\TeX~hackers~note:}
+ }
+ {
+ \vspace{3mm}
+ }
+\NewDocumentEnvironment { arguments } { }
+ {
+ \enumerate [
+ nolistsep ,
+ label = \texttt{\#\arabic*} ~ : ,
+ labelsep = * ,
+ ]
+ }
+ {
+ \endenumerate
+ }
+\keys_define:nn { l3doc/cmd }
+ {
+ index .tl_set:N = \l__codedoc_cmd_index_tl ,
+ replace .bool_set:N = \l__codedoc_cmd_replace_bool ,
+ }
+\cs_new:Npn \__codedoc_cmd:nn #1#2
+ {
+ \texorpdfstring
+ {
+ \CodedocUnexpandedTokens
+ { \CodedocUseCs { __codedoc_cmd_aux:nn } {#1} {#2} }
+ }
+ {#2}
+ }
+\cs_generate_variant:Nn \__codedoc_cmd:nn { no }
+\cs_new_protected:Npn \__codedoc_cmd_aux:nn #1#2
+ {
+ \bool_set_true:N \l__codedoc_cmd_replace_bool
+ \tl_set:Nn \l__codedoc_cmd_index_tl { \q_no_value }
+ \keys_set:nn { l3doc/cmd } {#1}
+ \tl_set:No \l__codedoc_cmd_tl { \token_to_str:N #2 }
+ \bool_if:NT \l__codedoc_cmd_replace_bool
+ {
+ \tl_set_rescan:Nnn \l__codedoc_tmpb_tl { } { _ }
+ \tl_replace_all:Non \l__codedoc_cmd_tl \l__codedoc_tmpb_tl { _ }
+ \__codedoc_replace_at_at:N \l__codedoc_cmd_tl
+ \tl_replace_all:Nno \l__codedoc_cmd_tl { _ } \l__codedoc_tmpb_tl
+ }
+ \mode_if_math:T { \mbox }
{
- \prop_put:Nxx \l__codedoc_functions_block_prop
- { \cs_to_str:N \q_recursion_tail }
- { { -1 } { } }
+ \verbatim@font
+ \int_compare:nNnF
+ { \tl_count:N \l__codedoc_cmd_tl }
+ < { \tl_count:f { \tl_to_str:N \l__codedoc_cmd_tl } }
+ {
+ \tl_set:Nx \l__codedoc_cmd_tl { \tl_to_str:N \l__codedoc_cmd_tl }
+ \tl_replace_all:Non \l__codedoc_cmd_tl
+ { \token_to_str:N _ } { \_ }
+ }
+ \tl_replace_all:Nnn \l__codedoc_cmd_tl { ~ } { \@xobeysp }
+ \l__codedoc_cmd_tl
}
- { \clist_map_function:nN {#1} \__codedoc_parse_functions:n }
-
- \small\ttfamily
- \begin{tabular}{ @{} l @{} r @{} }
- \toprule
- \prop_map_function:NN \l__codedoc_functions_block_prop \__codedoc_typeset_functions:nn
- \__codedoc_typeset_dates:
- \bottomrule
- \end{tabular}
- \normalfont\normalsize
- }
-\prop_new:N \l__codedoc_functions_block_prop
-\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
-\cs_new:Nn \__codedoc_parse_functions:n
- {
- \exp_args:Nxx \tl_if_head_eq_charcode:nNTF { \token_to_str:N #1 } {\cs_to_str:N \\}
- {
- \tl_gset_eq:NN \l__codedoc_function_name_prefix_tl \@backslashchar
- % for the weird functions named "\::N" and so on:
- \exp_args:Nx \tl_if_head_eq_charcode:nNTF { \cs_to_str:N #1 } { : }
- {
- % again, no variants:
- \prop_put:Nxx \l__codedoc_functions_block_prop { \cs_to_str:N #1 } { {-1} {} }
- }
- {
- % finally, for regular old csnames:
- \exp_args:NNf \prop_get:NnNTF
- \l__codedoc_functions_block_prop
- { \__cs_get_function_name:N #1 } \l__codedoc_tmpb_tl
- {
- \prop_put:Nxx \l__codedoc_functions_block_prop
- { \__cs_get_function_name:N #1 }
- {
- \l__codedoc_tmpb_tl ,
- {\__cs_count_signature:N #1}
- {\__cs_get_function_signature:N #1}
- }
- }
- {
- \prop_put:Nxx \l__codedoc_functions_block_prop
- { \__cs_get_function_name:N #1 }
+ \exp_args:No \__codedoc_key_get:n { \l__codedoc_cmd_tl }
+ \quark_if_no_value:NF \l__codedoc_cmd_index_tl
+ { \tl_set_eq:NN \l__codedoc_index_module_tl \l__codedoc_cmd_index_tl }
+ \__codedoc_special_index_module:ooon
+ { \l__codedoc_index_key_tl }
+ { \l__codedoc_index_macro_tl }
+ { \l__codedoc_index_module_tl }
+ { }
+ }
+\cs_new:Npn \__codedoc_meta:n #1
+ {
+ \texorpdfstring
+ {
+ \CodedocUnexpandedTokens
+ { \CodedocUseCs { __codedoc_meta_aux:n } {#1} }
+ }
+ { < #1 > }
+ }
+\cs_new_protected:Npn \__codedoc_meta_aux:n #1
+ {
+ \tl_set:Nn \l__codedoc_tmpa_tl {#1}
+ \tl_map_inline:nn
+ { { 3 } { 4 } { 7 } { 8 } { 11 } { 12 } { 13 } }
+ {
+ \tl_set_rescan:Nnn \l__codedoc_tmpb_tl
+ { \char_set_catcode:nn { `_ } {##1} } { _ }
+ \tl_replace_all:Non \l__codedoc_tmpa_tl \l__codedoc_tmpb_tl
+ { \__codedoc_ensuremath_sb:n }
+ }
+ \exp_args:NV \__codedoc_meta_original:n \l__codedoc_tmpa_tl
+ }
+\cs_new_protected:Npn \__codedoc_ensuremath_sb:n #1
+ { \ensuremath { \sb {#1} } }
+\cs_new_protected:Npn \__codedoc_meta_original:n #1
+ {
+ \ensuremath \langle
+ \mode_if_math:T { \nfss@text }
+ {
+ \meta@font@select
+ \edef \meta@hyphen@restore
+ { \hyphenchar \the \font \the \hyphenchar \font }
+ \hyphenchar \font \m@ne
+ \language \l@nohyphenation
+ #1 \/
+ \meta@hyphen@restore
+ }
+ \ensuremath \rangle
+ }
+\keys_define:nn { l3doc/function }
+ {
+ TF .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_TF_bool
+ } ,
+ EXP .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ } ,
+ rEXP .code:n =
+ {
+ \bool_set_false:N \l__codedoc_macro_EXP_bool
+ \bool_set_true:N \l__codedoc_macro_rEXP_bool
+ } ,
+ pTF .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_pTF_bool
+ \bool_set_true:N \l__codedoc_macro_TF_bool
+ \bool_set_true:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ } ,
+ added .tl_set:N = \l__codedoc_date_added_tl ,
+ updated .tl_set:N = \l__codedoc_date_updated_tl ,
+ tested .code:n = { } ,
+ no-label .bool_set:N = \l__codedoc_no_label_bool ,
+ }
+\cs_new_protected:Npn \__codedoc_function:nnw #1#2
+ {
+ \__codedoc_function_typeset_start:
+ \__codedoc_function_init:
+ \keys_set:nn { l3doc/function } {#1}
+ \__codedoc_verb_get_seq:nN {#2} \l__codedoc_function_input_seq
+ \__codedoc_function_parse:
+ \__codedoc_function_typeset:
+ \__codedoc_function_descr_start:w
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_end:
+ {
+ \__codedoc_function_descr_stop:
+ \__codedoc_function_assemble:
+ \__codedoc_function_typeset_stop:
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_typeset_start:
+ {
+ \par \bigskip \noindent
+ \phantomsection
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_typeset_stop:
+ {
+ \par
+ \allowbreak
+ }
+\cs_new_protected:Npn \__codedoc_function_init:
+ {
+ \coffin_clear:N \l__codedoc_descr_coffin
+ \box_gclear:N \g__codedoc_syntax_box
+ \coffin_clear:N \l__codedoc_syntax_coffin
+ \coffin_clear:N \l__codedoc_names_coffin
+ \bool_set_false:N \l__codedoc_macro_TF_bool
+ \bool_set_false:N \l__codedoc_macro_pTF_bool
+ \bool_set_false:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ \bool_set_false:N \l__codedoc_no_label_bool
+ \char_set_active:Npn < ##1 > { \meta {##1} }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_parse:
+ {
+ \seq_map_function:NN
+ \l__codedoc_function_input_seq
+ \__codedoc_function_parse_one:n
+ }
+\cs_new_protected:Npn \__codedoc_function_parse_one:n #1
+ {
+ \tl_if_head_eq_charcode:nNTF {#1} \c__codedoc_backslash_token
+ {
+ \tl_gset_eq:NN \g__codedoc_function_name_prefix_tl \c__codedoc_backslash_tl
+ \exp_args:No \tl_if_head_eq_charcode:nNTF { \use_none:n #1 } :
{
- {\__cs_count_signature:N #1}
- {\__cs_get_function_signature:N #1}
+ \prop_put:Nxn \l__codedoc_functions_block_prop
+ { \use_none:n #1 } { \scan_stop: }
}
- }
- }
- }
- {
- % for now don't bother splitting into variants:
- \tl_gclear:N \l__codedoc_function_name_prefix_tl
- \prop_put:Nxx \l__codedoc_functions_block_prop { \tl_to_str:n {#1} } { {-1} {} }
- }
- }
-\cs_new:Nn \__codedoc_typeset_functions:nn
- {
- \clist_gset:Nn \l__codedoc_variants_clist {#2}
- \clist_gpop:NN \l__codedoc_variants_clist \l__codedoc_tmpb_tl
- \exp_args:Nc \__codedoc_typeset_functions_aux:N
- {
- #1
- \int_compare:nT { \exp_after:wN \use_i:nn \l__codedoc_tmpb_tl > -1 } {:}
- \int_compare:nT { \exp_after:wN \use_i:nn \l__codedoc_tmpb_tl > 0 }
- { \exp_after:wN \use_ii:nn \l__codedoc_tmpb_tl }
- }
- \\
- }
-
-\cs_new_nopar:Nn \__codedoc_typeset_functions_aux:N
- {
- \bool_if:NT \l__codedoc_meta_pTF_bool
- {
- \tl_set:Nx \l__codedoc_pTF_name_tl
- { \l__codedoc_function_name_prefix_tl \__codedoc_predicate_from_base:N #1 }
- \__codedoc_special_main_index:o { \l__codedoc_pTF_name_tl }
- \seq_gput_right:Nx \g_doc_functions_seq
- { \tl_to_str:N \l__codedoc_pTF_name_tl }
- \tl_set:Nx \l__codedoc_pTF_name_tl { \__codedoc_predicate_from_base:N #1 }
- }
-
- \tl_set:Nx \l__codedoc_tmpa_tl
- {
- \l__codedoc_function_name_prefix_tl
- \cs_to_str:N #1
- \bool_if:NT \l__codedoc_meta_TF_bool { \tl_to_str:n {TF} }
- }
- \__codedoc_special_main_index:o { \l__codedoc_tmpa_tl }
- \seq_gput_right:No \g_doc_functions_seq { \l__codedoc_tmpa_tl }
-
- \bool_if:NTF \l__codedoc_meta_pTF_bool
- {
- \bool_gset_false:N \l__codedoc_meta_TF_bool
- \exp_args:Nc \__codedoc_typeset_function_block:N { \l__codedoc_pTF_name_tl }
- \bool_gset_true:N \l__codedoc_meta_TF_bool
-
+ {
+ \exp_args:Nc \__cs_split_function:NN { \use_none:n #1 }
+ \__codedoc_function_parse_cs_aux:nnN
+ }
+ }
+ {
+ \tl_gclear:N \g__codedoc_function_name_prefix_tl
+ \prop_put:Nnn \l__codedoc_functions_block_prop {#1} { \scan_stop: }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_function_parse_cs_aux:nnN #1#2#3
+ {
+ \prop_get:NnNF
+ \l__codedoc_functions_block_prop {#1} \l__codedoc_tmpb_tl
+ { \tl_clear:N \l__codedoc_tmpb_tl }
+ \prop_put:Nnx \l__codedoc_functions_block_prop {#1}
+ {
+ \l__codedoc_tmpb_tl ,
+ \bool_if:NTF #3 { {#2} } { \scan_stop: }
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_typeset:
+ {
+ \dim_zero:N \l__codedoc_trial_width_dim
+ \hcoffin_set:Nn \l__codedoc_names_coffin { \__codedoc_typeset_names: }
+ \dim_set:Nn \l__codedoc_trial_width_dim
+ { \box_wd:N \l__codedoc_names_coffin }
+ \bool_set:Nn \l__codedoc_long_name_bool
+ { \dim_compare_p:nNn \l__codedoc_trial_width_dim > \marginparwidth }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_descr_start:w
+ {
+ \vcoffin_set:Nnw \l__codedoc_descr_coffin { \textwidth }
+ \noindent \ignorespaces
+ }
+\cs_new_protected_nopar:Npn \__codedoc_function_descr_stop:
+ { \vcoffin_set_end: }
+\cs_new_protected_nopar:Npn \__codedoc_function_assemble:
+ {
+ \hcoffin_set:Nn \l__codedoc_syntax_coffin
+ { \box_use:N \g__codedoc_syntax_box }
+ \bool_if:NTF \l__codedoc_long_name_bool
+ {
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {hc} {vc}
+ \l__codedoc_syntax_coffin {l} {T}
+ {0pt} {0pt}
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {l} {t}
+ \l__codedoc_names_coffin {r} {t}
+ {-\marginparsep} {0pt}
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {l} {b}
+ \l__codedoc_descr_coffin {l} {t}
+ {0.75\marginparwidth + \marginparsep} {-\medskipamount}
+ \coffin_typeset:Nnnnn \l__codedoc_output_coffin
+ {\l__codedoc_descr_coffin-l} {\l__codedoc_descr_coffin-t}
+ {0pt} {0pt}
+ }
+ {
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {hc} {vc}
+ \l__codedoc_syntax_coffin {l} {t}
+ {0pt} {0pt}
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {l} {b}
+ \l__codedoc_descr_coffin {l} {t}
+ {0pt} {-\medskipamount}
+ \coffin_join:NnnNnnnn
+ \l__codedoc_output_coffin {l} {t}
+ \l__codedoc_names_coffin {r} {t}
+ {-\marginparsep} {0pt}
+ \coffin_typeset:Nnnnn \l__codedoc_output_coffin
+ {\l__codedoc_syntax_coffin-l} {\l__codedoc_syntax_coffin-T}
+ {0pt} {0pt}
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_typeset_names:
+ {
+ \small\ttfamily
+ \begin{tabular} { @{} l @{} r @{} }
+ \toprule
+ \__codedoc_typeset_functions:
+ \__codedoc_typeset_dates:
+ \bottomrule
+ \end{tabular}
+ \normalfont\normalsize
+ }
+\cs_new_protected_nopar:Npn \__codedoc_typeset_functions:
+ {
+ \prop_map_function:NN \l__codedoc_functions_block_prop
+ \__codedoc_typeset_functions_auxi:nn
+ }
+\cs_new_protected:Npn \__codedoc_typeset_functions_auxi:nn #1#2
+ {
+ \tl_gset:Nn \g__codedoc_base_name_tl {#1}
+ \prop_clear:N \l__codedoc_variants_prop
+ \clist_map_inline:nn {#2}
+ {
+ \tl_set:Nx \l__codedoc_tmpa_tl
+ { \__codedoc_signature_base_form:n {##1} }
+ \prop_get:NoNTF \l__codedoc_variants_prop
+ \l__codedoc_tmpa_tl \l__codedoc_tmpb_tl
+ { \tl_put_right:Nn \l__codedoc_tmpb_tl { , {##1} } }
+ { \tl_set:Nn \l__codedoc_tmpb_tl { {##1} } }
+ \prop_put:Noo \l__codedoc_variants_prop
+ \l__codedoc_tmpa_tl \l__codedoc_tmpb_tl
+ }
+ \prop_map_function:NN \l__codedoc_variants_prop
+ \__codedoc_typeset_functions_auxii:nn
+ }
+\cs_new_protected:Npn \__codedoc_typeset_functions_auxii:nn #1#2
+ {
+ \clist_gset:Nn \g__codedoc_variants_clist {#2}
+ \clist_gpop:NN \g__codedoc_variants_clist \l__codedoc_tmpb_tl
+ \exp_args:Nc \__codedoc_typeset_functions_auxiii:N
+ {
+ \g__codedoc_base_name_tl
+ \exp_last_unbraced:Nf \token_if_eq_meaning:NNF
+ { \tl_head:f { \l__codedoc_tmpb_tl ? } }
+ \scan_stop:
+ { : \l__codedoc_tmpb_tl }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_typeset_functions_auxiii:N #1
+ {
+ \bool_if:NT \l__codedoc_macro_pTF_bool
+ {
+ \tl_set:Nx \l__codedoc_pTF_name_tl
+ { \__codedoc_predicate_from_base:N #1 }
+ \__codedoc_function_index:x { \l__codedoc_pTF_name_tl }
+ }
+ \__codedoc_function_index:x
+ {
+ \cs_to_str:N #1
+ \bool_if:NT \l__codedoc_macro_TF_bool { \tl_to_str:n {TF} }
+ }
+ \bool_if:NT \l__codedoc_macro_pTF_bool
+ {
+ \exp_args:Nc \__codedoc_typeset_function_block:NN
+ { \l__codedoc_pTF_name_tl } \c_false_bool
+ }
+ \__codedoc_typeset_function_block:NN #1 \l__codedoc_macro_TF_bool
+ }
+\cs_new_protected:Npn \__codedoc_function_index:x #1
+ {
+ \tl_set:Nx \l__codedoc_tmpa_tl
+ { \g__codedoc_function_name_prefix_tl #1 }
+ \seq_gput_right:No \g_doc_functions_seq { \l__codedoc_tmpa_tl }
+ \__codedoc_special_index:on { \l__codedoc_tmpa_tl } { usage }
+ }
+\cs_new_protected:Npn \__codedoc_typeset_function_block:NN #1#2
+ {
+ \__codedoc_function_label:x
+ { \g__codedoc_function_name_prefix_tl \cs_to_str:N #1 }
+ \g__codedoc_function_name_prefix_tl \cs_to_str:N #1
+ \bool_if:NT #2 { \__codedoc_typeset_TF: }
+ \__codedoc_typeset_expandability:
+ \clist_if_empty:NF \g__codedoc_variants_clist
+ { \__codedoc_typeset_variant_list:NN #1#2 }
\\
- \__codedoc_typeset_function_block:N #1
- }
- {
- \exp_args:Nx \tl_if_head_eq_charcode:nNTF { \exp_after:wN \use_none:n \token_to_str:N #1 } {:}
- { \__codedoc_show_macro_unusual:N #1 }
- { \__codedoc_typeset_function_block:N #1 }
- }
-}
-\cs_set_nopar:Nn \__codedoc_typeset_function_block:N
- {
- \tl_gset:Nx \l__codedoc_function_name_tl { \__cs_get_function_name:N #1 }
- \tl_gset:Nx \l__codedoc_function_sig_tl { \__cs_get_function_signature:N #1 }
- \tl_gset:Nx \g__codedoc_macro_tl { \l__codedoc_function_name_prefix_tl \l__codedoc_function_name_tl }
-
- \__codedoc_typeset_function_basename:N #1
- \bool_if:NT \l__codedoc_meta_TF_bool { \__codedoc_typeset_TF: }
- \__codedoc_typeset_expandability:
- \clist_if_empty:NF \l__codedoc_variants_clist { \__codedoc_typeset_variants: }
- \bool_if:NT \g__codedoc_full_bool { \__codedoc_label_function:N #1 }
- }
-\cs_set:Nn \__codedoc_typeset_function_basename:N
- { \l__codedoc_function_name_prefix_tl \cs_to_str:N #1 }
-\cs_set:Nn \__codedoc_typeset_expandability:
- {
- &
- \bool_if:NT \l__codedoc_meta_EXP_bool
- {
- \hspace{\tabcolsep}
- \hyperlink{expstar} {$\star$}
- }
- \bool_if:NT \l__codedoc_meta_rEXP_bool
- {
- \hspace{\tabcolsep}
- \hyperlink{rexpstar} {\ding{73}} % hollow star
- }
- }
-\cs_set:Nn \__codedoc_typeset_variants:
- {
- \\
- \__codedoc_typeset_aux:n \g__codedoc_macro_tl :
- \int_compare:nTF { \clist_count:N \l__codedoc_variants_clist == 1 }
- { \exp_after:wN \use_ii:nn \l__codedoc_variants_clist }
- {
- \textrm(
- \clist_pop:NN \l__codedoc_variants_clist \l__codedoc_tmpb_tl
- \exp_after:wN \use_ii:nn \l__codedoc_tmpb_tl
- \clist_map_inline:Nn \l__codedoc_variants_clist {\textrm| \use_ii:nn ##1}
- \textrm)
- }
- \bool_if:NT \l__codedoc_meta_TF_bool { \__codedoc_typeset_TF: }
- &
- \bool_if:NT \l__codedoc_meta_EXP_bool
- {
- \hspace{\tabcolsep}
- \hyperlink{expstar} {$\star$}
- }
- \bool_if:NT \l__codedoc_meta_rEXP_bool
- {
- \hspace{\tabcolsep}
- \hyperlink{rexpstar} {\ding{73}} % hollow star
- }
- }
-\cs_set:Nn \__codedoc_label_function:N
- {
- \tl_set:Nx \l__codedoc_tmpa_tl { \l__codedoc_function_name_prefix_tl \cs_to_str:N #1 }
- \exp_args:NNf \tl_replace_all:Nnn \l__codedoc_tmpa_tl {\token_to_str:N _} {/}
- \exp_args:NNf \tl_remove_all:Nn \l__codedoc_tmpa_tl {\@backslashchar}
- \exp_args:Nx \label {doc/function//\l__codedoc_tmpa_tl}
- }
-\cs_set_nopar:Nn \__codedoc_show_macro_unusual:N
- {
- \tl_gset:Nx \g__codedoc_macro_tl { \token_to_str:N #1}
- \token_to_str:N #1 &
-
- \exp_args:NNf \tl_replace_all:Nnn \g__codedoc_macro_tl {\token_to_str:N _} {/}
- \exp_args:NNf \tl_replace_all:Nnn \g__codedoc_macro_tl {\@backslashchar} {}
- \bool_if:NT \g__codedoc_full_bool
- {
- \exp_args:Nx \label { doc/function//\g__codedoc_macro_tl }
- }
- }
-\cs_set:Nn \__codedoc_typeset_dates:
- {
- \bool_if:nF { \tl_if_empty_p:N \l__codedoc_date_added_tl &&
- \tl_if_empty_p:N \l__codedoc_date_updated_tl }
- { \midrule }
-
- \tl_if_empty:NF \l__codedoc_date_added_tl
- {
- \multicolumn{2}{@{}r@{}}
- { \scriptsize New:\,\l__codedoc_date_added_tl } \\
- }
-
- \tl_if_empty:NF \l__codedoc_date_updated_tl
- {
- \multicolumn{2}{@{}r@{}}
- { \scriptsize Updated:\,\l__codedoc_date_updated_tl } \\
- }
- }
-\newenvironment{syntax}
- {
- \small\ttfamily
- \bool_if:NTF \l__codedoc_long_name_bool
- {
- \hbox_gset:Nw \g__codedoc_syntax_box
- \arrayrulecolor{white}
- \begin{tabular}{@{}l@{}}
- \toprule
- \begin{minipage}
- { \textwidth+0.75\marginparwidth-\l__codedoc_trial_width_dim }
- }
- {
- \hbox_gset:Nw \g__codedoc_syntax_box
- \arrayrulecolor{white}
- \begin{tabular}{@{}l@{}}
- \toprule
- \begin{minipage}{ \textwidth }
- }
- \raggedright
- \obeyspaces\obeylines
- }
- {
- \end{minipage}
- \end{tabular}
- \arrayrulecolor{black}
- \hbox_set_end:
- \ignorespacesafterend
- }
-\cs_new:Npn \__codedoc_ensuremath_sb:n #1
- {
- \ensuremath{\sb{#1}}
- }
-\cs_set_eq:NN \__codedoc_meta:n \meta
-\cs_set:Npn \meta
- {
- \group_begin:
- \char_set_active_eq:NN _ \__codedoc_ensuremath_sb:n
- \__codedoc_close_meta:n
- }
-\cs_new:Npn \__codedoc_open_meta:w
- {
- \group_begin:
- \char_set_active_eq:NN _ \__codedoc_ensuremath_sb:n
- \__codedoc_close_meta:w
- }
-\cs_new:Npn \Arg
- {
- \texttt{ \char`\{ }
- \group_begin:
- \char_set_active_eq:NN _ \__codedoc_ensuremath_sb:n
- \__codedoc_close_Arg:n
- }
-\cs_new_nopar:Npn \__codedoc_close_meta:n #1 { \__codedoc_meta:n {#1} \group_end: }
-\cs_new_nopar:Npn \__codedoc_close_meta:w #1> { \__codedoc_meta:n {#1} \group_end: }
-\cs_new_nopar:Npn \__codedoc_close_Arg:n #1
- {
- \__codedoc_meta:n {#1}
- \group_end:
- \texttt{ \char`\} }
- }
-\keys_define:nn { l3doc/macro }
- {
- aux .code:n =
- { \bool_set_true:N \l__codedoc_macro_aux_bool } ,
- internal .code:n =
- { \bool_set_true:N \l__codedoc_macro_internal_bool } ,
- int .code:n =
- { \bool_set_true:N \l__codedoc_macro_internal_bool } ,
- var .code:n =
- { \bool_set_true:N \l__codedoc_macro_var_bool } ,
- TF .code:n =
- { \bool_set_true:N \l__codedoc_macro_TF_bool } ,
- pTF .code:n =
- { \bool_set_true:N \l__codedoc_macro_pTF_bool } ,
- tested .code:n =
- { } ,
- EXP .code:n = {} , % TODO
- rEXP .code:n = {} , % TODO
- added .code:n = {} , % TODO
- updated .code:n = {} , % TODO
- }
-\RenewDocumentCommand { \macro } { O{} } { \__codedoc_macro:n {#1} }
-\cs_new_protected:Npn \__codedoc_macro:n #1
- {
-
- \int_compare:nNnTF \currentgrouplevel=2
- { \int_gzero:N \g__codedoc_nested_macro_int }
- { \int_incr:N \g__codedoc_nested_macro_int }
-
- \bool_set_false:N \l__codedoc_macro_aux_bool
- \bool_set_false:N \l__codedoc_macro_internal_bool
- \bool_set_false:N \l__codedoc_macro_TF_bool
- \bool_set_false:N \l__codedoc_macro_pTF_bool
- \bool_set_false:N \l__codedoc_macro_var_bool
- \bool_set_false:N \l__codedoc_tested_bool
-
- \cs_set_eq:NN \__codedoc_macroname_prefix:n \use:n
- \cs_set_eq:NN \__codedoc_macroname_suffix: \c_empty_tl
-
- \keys_set:nn { l3doc/macro } {#1}
-
- \cs_set_eq:NN \testfile \__codedoc_print_testfile:n
+ }
+\cs_new_protected_nopar:Npn \__codedoc_typeset_expandability:
+ {
+ &
+ \bool_if:NT \l__codedoc_macro_EXP_bool
+ {
+ \hspace{\tabcolsep}
+ \hyperlink{expstar} {$\star$}
+ }
+ \bool_if:NT \l__codedoc_macro_rEXP_bool
+ {
+ \hspace{\tabcolsep}
+ \hyperlink{rexpstar} {\ding{73}} % hollow star
+ }
+ }
+\cs_new_protected:Npn \__codedoc_typeset_variant_list:NN #1#2
+ {
+ \\
+ \__codedoc_typeset_aux:n
+ {
+ \g__codedoc_function_name_prefix_tl
+ \__cs_get_function_name:N #1
+ }
+ :
+ \int_compare:nTF { \clist_count:N \g__codedoc_variants_clist == 1 }
+ { \clist_use:Nn \g__codedoc_variants_clist { } }
+ {
+ \textrm(
+ \clist_use:Nn \g__codedoc_variants_clist { \textrm| }
+ \textrm)
+ }
+ \bool_if:NT #2 { \__codedoc_typeset_TF: }
+ \__codedoc_typeset_expandability:
+ }
+\cs_new_protected:Npn \__codedoc_function_label:n #1
+ {
+ % \bool_if:NT \g__codedoc_typeset_implementation_bool
+ % {
+ \bool_if:NF \l__codedoc_no_label_bool
+ {
+ \__codedoc_get_hyper_target:nN {#1} \l__codedoc_tmpa_tl
+ \exp_args:No \label { \l__codedoc_tmpa_tl }
+ }
+ % }
+ }
+\cs_generate_variant:Nn \__codedoc_function_label:n { x }
+\cs_new_nopar:Npn \__codedoc_typeset_dates:
+ {
+ \bool_if:nF
+ {
+ \tl_if_empty_p:N \l__codedoc_date_added_tl &&
+ \tl_if_empty_p:N \l__codedoc_date_updated_tl
+ }
+ { \midrule }
+ \tl_if_empty:NF \l__codedoc_date_added_tl
+ {
+ \multicolumn { 2 } { @{} r @{} }
+ { \scriptsize New: \, \l__codedoc_date_added_tl } \\
+ }
- \peek_meaning_ignore_spaces:NTF \c_group_begin_token
- {
- \group_begin:
- \MakePrivateLetters
- \char_set_catcode_letter:N \\
- \char_set_catcode_ignore:N \ % space
- \char_set_catcode_ignore:N \^^M
- \char_set_catcode_ignore:N \^^I
- \__codedoc_macro_aux:n
- }
- {
- \__codedoc_macro_verbatim:w
- }
- }
-\NewDocumentCommand {\__codedoc_macro_verbatim:w} {v}
- {
- \group_begin: % pretty useless
- \__codedoc_macro_aux:n {#1}
- }
-\clist_new:N \l__codedoc_macro_input_clist
-\cs_new_nopar:Npn \__codedoc_macro_aux:n #1
- {
- \group_end:
- \clist_set:Nn \l__codedoc_macro_input_clist {#1}
- \bool_if:NTF \l__codedoc_macro_pTF_bool
- {
- \clist_map_inline:Nn \l__codedoc_macro_input_clist
- {
- \exp_args:Nx \__codedoc_macro_single:n { \__codedoc_predicate_from_base:w ##1 \q_nil }
+ \tl_if_empty:NF \l__codedoc_date_updated_tl
+ {
+ \multicolumn { 2 } { @{} r @{} }
+ { \scriptsize Updated: \, \l__codedoc_date_updated_tl } \\
+ }
+ }
+\dim_new:N \l__codedoc_syntax_dim
+\cs_new_protected:Npn \__codedoc_syntax:w
+ {
+ \dim_set:Nn \l__codedoc_syntax_dim
+ {
+ \textwidth
+ \bool_if:NT \l__codedoc_long_name_bool
+ { + 0.75 \marginparwidth - \l__codedoc_trial_width_dim }
}
- \bool_set_true:N \l__codedoc_macro_TF_bool
- \clist_map_function:NN \l__codedoc_macro_input_clist \__codedoc_macro_single:n
+ \hbox_gset:Nw \g__codedoc_syntax_box
+ \small \ttfamily
+ \arrayrulecolor{white}
+ \begin{tabular} { @{} l @{} }
+ \toprule
+ \begin{minipage}{\l__codedoc_syntax_dim}
+ \raggedright
+ \obeyspaces
+ \obeylines
+ }
+\cs_new_protected:Npn \__codedoc_syntax_end:
+ {
+ \end{minipage}
+ \end{tabular}
+ \arrayrulecolor{black}
+ \hbox_gset_end:
+ }
+\keys_define:nn { l3doc/macro }
+ {
+ aux .code:n =
+ { \bool_set_true:N \l__codedoc_macro_aux_bool } ,
+ internal .code:n =
+ { \bool_set_true:N \l__codedoc_macro_internal_bool } ,
+ int .code:n =
+ { \bool_set_true:N \l__codedoc_macro_internal_bool } ,
+ var .code:n =
+ { \bool_set_true:N \l__codedoc_macro_var_bool } ,
+ TF .code:n =
+ { \bool_set_true:N \l__codedoc_macro_TF_bool } ,
+ pTF .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_TF_bool
+ \bool_set_true:N \l__codedoc_macro_pTF_bool
+ \bool_set_true:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ } ,
+ EXP .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ } ,
+ rEXP .code:n =
+ {
+ \bool_set_false:N \l__codedoc_macro_EXP_bool
+ \bool_set_true:N \l__codedoc_macro_rEXP_bool
+ } ,
+ tested .code:n =
+ {
+ \bool_set_true:N \l__codedoc_macro_tested_bool
+ } ,
+ added .code:n = {} , % TODO
+ updated .code:n = {} , % TODO
+ }
+\cs_new_protected:Npn \__codedoc_macro:nnw #1#2
+ {
+ \__codedoc_macro_init:
+ \keys_set:nn { l3doc/macro } {#1}
+ \__codedoc_verb_get_seq:nN {#2} \l__codedoc_macro_input_seq
+ \__codedoc_macro_map:N \__codedoc_macro_single:n
+ \__codedoc_macro_typeset:
+ }
+\cs_new_protected_nopar:Npn \__codedoc_macro_init:
+ {
+ \int_incr:N \l__codedoc_nested_macro_int
+ \bool_set_false:N \l__codedoc_macro_aux_bool
+ \bool_set_false:N \l__codedoc_macro_internal_bool
\bool_set_false:N \l__codedoc_macro_TF_bool
- }
- { \clist_map_function:NN \l__codedoc_macro_input_clist \__codedoc_macro_single:n }
- }
-\cs_set:Nn \__codedoc_predicate_from_base:N
- {
- \__cs_get_function_name:N #1 _p: \__cs_get_function_signature:N #1
- }
-\cs_set:Npn \__codedoc_predicate_from_base:w #1 : #2 \q_nil
- {
- #1 _p: #2
- }
-\cs_set_nopar:Npn \__codedoc_macro_single:n #1
- {
- \int_incr:N \l__codedoc_macro_int
-
- \tl_set:Nx \l__codedoc_at_replaced_macro_tl { \token_to_str:N #1 }
- \__codedoc_replace_at_at:N \l__codedoc_at_replaced_macro_tl
- \tl_set_eq:NN \saved@macroname \l__codedoc_at_replaced_macro_tl
-
- \topsep\MacroTopsep
- \trivlist
- \cs_set_nopar:Npn \makelabel ##1 { \llap{##1} }
- \if@inlabel
- \cs_set_eq:NN \@tempa \@empty
- \count@ \macro@cnt
- \loop \ifnum\count@>\z@
- \cs_set_nopar:Npx \@tempa{\@tempa\hbox{\strut}}
- \advance\count@\m@ne
- \repeat
- \cs_set_nopar:Npx \makelabel ##1
- {
- \llap{\vtop to\baselineskip {\@tempa\hbox{##1}\vss}}
- }
- \advance \macro@cnt \@ne
- \else
- \macro@cnt \@ne
- \fi
-
- \bool_if:NT \l__codedoc_macro_aux_bool
- {
- \cs_set_eq:NN \__codedoc_macroname_prefix:n \__codedoc_typeset_aux:n
- }
- \bool_if:NT \l__codedoc_macro_TF_bool
- {
- \cs_set_eq:NN \__codedoc_macroname_suffix: \__codedoc_typeset_TF:
- }
-
- \bool_if:NF \l__codedoc_macro_aux_bool
- {
- \tl_gset:Nx \l__codedoc_macro_tl { \tl_to_str:N \l__codedoc_at_replaced_macro_tl }
- \exp_args:NNf \tl_greplace_all:Nnn \l__codedoc_macro_tl {\token_to_str:N _} {/}
- \exp_args:NNf \tl_greplace_all:Nnn \l__codedoc_macro_tl {\@backslashchar} {}
- }
-
- \use:x
- {
- \exp_not:N \item [ \exp_not:N \__codedoc_print_macroname:n {
- \tl_to_str:N \l__codedoc_at_replaced_macro_tl
- }]
- }
- \int_gincr:N \c@CodelineNo
-
- \bool_if:NF \l__codedoc_macro_aux_bool
- {
- \bool_if:NTF \l__codedoc_macro_TF_bool
- {
- \seq_gput_right:Nx \g_doc_macros_seq { \tl_to_str:N \l__codedoc_at_replaced_macro_tl \tl_to_str:n {TF} }
- \seq_gput_right:Nx \g_doc_macros_seq { \tl_to_str:N \l__codedoc_at_replaced_macro_tl \tl_to_str:n {T } }
- \seq_gput_right:Nx \g_doc_macros_seq { \tl_to_str:N \l__codedoc_at_replaced_macro_tl \tl_to_str:n { F} }
- }
- {
- \seq_gput_right:Nx \g_doc_macros_seq { \tl_to_str:N \l__codedoc_at_replaced_macro_tl }
- }
- }
- \bool_if:NTF \l__codedoc_macro_TF_bool
- {
- \exp_args:Nx \SpecialMainIndex{ \tl_to_str:N \l__codedoc_at_replaced_macro_tl TF}\nobreak
- \exp_args:Nx \DoNotIndex{ \tl_to_str:N \l__codedoc_at_replaced_macro_tl TF}
- }
- {
- \exp_args:Nx \SpecialMainIndex{ \tl_to_str:N \l__codedoc_at_replaced_macro_tl }\nobreak
- \exp_args:Nx \DoNotIndex{ \tl_to_str:N \l__codedoc_at_replaced_macro_tl }
- }
+ \bool_set_false:N \l__codedoc_macro_pTF_bool
+ \bool_set_false:N \l__codedoc_macro_EXP_bool
+ \bool_set_false:N \l__codedoc_macro_rEXP_bool
+ \bool_set_false:N \l__codedoc_macro_var_bool
+ \bool_set_false:N \l__codedoc_macro_tested_bool
+ \cs_set_eq:NN \testfile \__codedoc_print_testfile:n
+ \box_clear:N \l__codedoc_macro_index_box
+ \vbox_set:Nn \l__codedoc_macro_box
+ {
+ \hbox:n { \strut }
+ \vskip \int_eval:n { \l__codedoc_macro_int - 1 } \baselineskip
+ }
+ }
+\cs_new_protected:Npn \__codedoc_macro_map:N #1
+ {
+ \bool_if:NT \l__codedoc_macro_pTF_bool
+ {
+ \bool_set_false:N \l__codedoc_macro_TF_bool
+ \seq_map_inline:Nn \l__codedoc_macro_input_seq
+ {
+ \tl_set:Nn \l__codedoc_tmpa_tl {##1}
+ \tl_replace_once:Noo \l__codedoc_tmpa_tl
+ { \tl_to_str:n { : } } { \tl_to_str:n { _p: } }
+ \exp_args:No #1 \l__codedoc_tmpa_tl
+ }
+ \bool_set_true:N \l__codedoc_macro_TF_bool
+ }
+ \seq_map_function:NN \l__codedoc_macro_input_seq #1
+ }
+\cs_new_protected_nopar:Npn \__codedoc_macro_typeset:
+ {
+ \topsep\MacroTopsep
+ \trivlist
+ \cs_set:Npn \makelabel ##1
+ {
+ \llap
+ {
+ \hbox_unpack_clear:N \l__codedoc_macro_index_box
+ \vtop to \baselineskip
+ {
+ \vbox_unpack_clear:N \l__codedoc_macro_box
+ \vss
+ }
+ }
+ }
+ \item [ ]
+ }
+\cs_new_protected:Npn \__codedoc_macro_single:n #1
+ {
+ \tl_set:Nn \saved@macroname {#1}
- \int_gdecr:N \c@CodelineNo
- \ignorespaces
- }
-\tl_clear:N \l__codedoc_macro_tl
-\cs_set_nopar:Npn \__codedoc_print_macroname:n #1
- {
- \strut
- \HD@target
- \int_compare:nTF { \tl_count:n {#1} <= 28 }
- { \MacroFont } { \MacroLongFont }
+ \__codedoc_macro_typeset_one:n {#1}
+ \exp_args:Nx \__codedoc_macro_index:n
+ {
+ #1
+ \bool_if:NT \l__codedoc_macro_TF_bool { \tl_to_str:n { TF } }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_macro_index:n #1
+ {
+ \bool_if:NF \l__codedoc_macro_aux_bool
+ { \seq_gput_right:Nn \g_doc_macros_seq {#1} }
+ \hbox_set:Nn \l__codedoc_macro_index_box
+ {
+ % This box only contains targets... it seems inefficient.
+ \hbox_unpack_clear:N \l__codedoc_macro_index_box
+ \int_gincr:N \c@CodelineNo
+ \__codedoc_special_index:nn {#1} { main }
+ \DoNotIndex {#1}
+ \int_gdecr:N \c@CodelineNo
+ }
+ }
+\cs_new_protected:Npn \__codedoc_macro_typeset_one:n #1
+ {
+ \vbox_set:Nn \l__codedoc_macro_box
+ {
+ \vbox_unpack_clear:N \l__codedoc_macro_box
+ \hbox { \llap { \__codedoc_print_macroname:n {#1} \ } }
+ }
+ \int_incr:N \l__codedoc_macro_int
+ }
+\cs_new_protected:Npn \__codedoc_print_macroname:n #1
+ {
+ \strut
+ \HD@target
- % INEFFICIENT: (!)
- \exp_args:NNx \seq_if_in:NnTF \g_doc_functions_seq
- { #1 \bool_if:NT \l__codedoc_macro_TF_bool { \tl_to_str:n {TF} } }
- {
- \hyperref [doc/function//\l__codedoc_macro_tl]
- }
- { \use:n }
- {
- \__codedoc_macroname_prefix:n {#1} \__codedoc_macroname_suffix: \ % space!
- }
- }
+ % TODO: INEFFICIENT(!)
+ \exp_args:NNx \seq_if_in:NnTF \g_doc_functions_seq
+ { #1 \bool_if:NT \l__codedoc_macro_TF_bool { \tl_to_str:n {TF} } }
+ {
+ \__codedoc_get_hyper_target:nN {#1} \l__codedoc_tmpa_tl
+ \exp_last_unbraced:NNo \hyperref [ \l__codedoc_tmpa_tl ]
+ }
+ { \use:n }
+ {
+ \int_compare:nTF { \tl_count:n {#1} <= 28 }
+ { \MacroFont } { \MacroLongFont }
+ \__codedoc_macroname_prefix:n {#1} \__codedoc_macroname_suffix:
+ }
+ }
+\cs_new_protected:Npn \__codedoc_macroname_prefix:n #1
+ {
+ \bool_if:NTF \l__codedoc_macro_aux_bool
+ { \__codedoc_typeset_aux:n {#1} } {#1}
+ }
+\cs_new_protected_nopar:Npn \__codedoc_macroname_suffix:
+ { \bool_if:NTF \l__codedoc_macro_TF_bool { \__codedoc_typeset_TF: } { } }
\providecommand \MacroLongFont
- {
- \fontfamily{lmtt}\fontseries{lc}\small
- }
-\cs_set_nopar:Npn \__codedoc_typeset_TF:
- {
- \hyperlink{explTF}
- {
- \color{black}
- \itshape TF
- \makebox[0pt][r]
- {
- \color{red}
- \underline { \phantom{\itshape TF} \kern-0.1em }
- }
- }
- }
-\cs_set_nopar:Npn \__codedoc_typeset_aux:n #1
- {
- { \color[gray]{0.7} #1 }
- }
-\DeclareDocumentCommand \__codedoc_print_testfile:n {m}
- {
- \bool_set_true:N \l__codedoc_tested_bool
- \tl_if_eq:nnF {#1} {*}
- {
- \seq_if_in:NnF \g__codedoc_testfiles_seq {#1}
- {
- \seq_gput_right:Nn \g__codedoc_testfiles_seq {#1}
- \par
- \__codedoc_print_testfile_aux:n {#1}
- }
- }
- }
+ {
+ \fontfamily{lmtt}\fontseries{lc}\small
+ }
+\cs_new_protected:Npn \__codedoc_print_testfile:n #1
+ {
+ \bool_set_true:N \l__codedoc_macro_tested_bool
+ \tl_if_eq:nnF {#1} {*}
+ {
+ \seq_if_in:NnF \g__codedoc_testfiles_seq {#1}
+ {
+ \seq_gput_right:Nn \g__codedoc_testfiles_seq {#1}
+ \par
+ \__codedoc_print_testfile_aux:n {#1}
+ }
+ }
+ }
\cs_new_protected:Npn \__codedoc_print_testfile_aux:n #1
- {
- \footnotesize
- (
- \textit{
- The~ test~ suite~ for~ this~ command,~
- and~ others~ in~ this~ file,~ is~ \textsf{#1}
- }.
- )\par
- }
+ {
+ \footnotesize
+ (
+ \textit
+ {
+ The~ test~ suite~ for~ this~ command,~
+ and~ others~ in~ this~ file,~ is~ \textsf{#1}
+ }.
+ )\par
+ }
\DeclareDocumentCommand \TestFiles {m}
- {
- \par
- {\itshape
- The~ following~ test~ files~ are~ used~ for~ this~ code:~ \textsf{#1}.
- }
- \par\ignorespaces
- }
-\DeclareDocumentCommand \UnitTested {} { \testfile* }
-\cs_generate_variant:Nn \prop_gput:Nnn {NVx}
-\DeclareDocumentCommand \TestMissing {m}
- {
- \prop_if_in:NVTF \g__codedoc_missing_tests_prop \l__codedoc_macro_input_clist
- {
- \prop_get:NVN \g__codedoc_missing_tests_prop \l__codedoc_macro_input_clist \l__codedoc_tmpa_tl
- \prop_gput:NVx \g__codedoc_missing_tests_prop \l__codedoc_macro_input_clist
+ {
+ \par
+ \textit
+ {
+ The~ following~ test~ files~ are~
+ used~ for~ this~ code:~ \textsf{#1}.
+ }
+ \par \ignorespaces
+ }
+\DeclareDocumentCommand \UnitTested { } { \testfile* }
+\DeclareDocumentCommand \TestMissing { m }
+ { \__codedoc_test_missing:n {#1} }
+\cs_new_protected:Npn \__codedoc_test_missing:n #1
+ {
+ \tl_set:Nx \l__codedoc_tmpb_tl
+ { \seq_use:Nn \l__codedoc_macro_input_seq { , } }
+ \prop_if_in:NVTF \g__codedoc_missing_tests_prop \l__codedoc_tmpb_tl
+ {
+ \prop_get:NVN \g__codedoc_missing_tests_prop \l__codedoc_tmpb_tl
+ \l__codedoc_tmpa_tl
+ }
+ { \tl_clear:N \l__codedoc_tmpa_tl }
+ \clist_set:Nx \l__codedoc_tmpa_clist { \l__codedoc_tmpa_tl , #1 }
+ \prop_gput:NVV \g__codedoc_missing_tests_prop \l__codedoc_tmpb_tl
+ \l__codedoc_tmpa_clist
+ }
+\cs_new_protected:Npn \__codedoc_macro_end:
+ {
+ \endtrivlist
+ \__codedoc_macro_end_check_tested:
+ \int_compare:nNnT \l__codedoc_nested_macro_int = 1
+ {
+ \__codedoc_macro_end_style:n
+ {
+ \__codedoc_print_end_definition:
+ \__codedoc_print_documented:
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_macro_end_check_tested:
+ {
+ \bool_if:nT
{
- *~ \l__codedoc_tmpa_tl
- ^^J \exp_not:n {\space\space\space\space\space\space}
- *~ #1
+ \g__codedoc_checktest_bool &&
+ ! \l__codedoc_macro_aux_bool &&
+ ! \l__codedoc_macro_var_bool &&
+ ! \l__codedoc_macro_tested_bool
}
- }
- { \prop_gput:NVn \g__codedoc_missing_tests_prop \l__codedoc_macro_input_clist {#1} }
- }
-\tl_new:N \g__codedoc_module_name_tl
-\cs_new_protected:Npn \__codedoc_replace_at_at:N #1
- {
- \tl_if_empty:NF \g__codedoc_module_name_tl
- {
- \tl_replace_all:Non #1 { \token_to_str:N @ } { @ }
- \tl_replace_all:Non #1 { \token_to_str:N _ } { _ }
- \tl_replace_all:Nox #1 { _@ @ } { __ \g__codedoc_module_name_tl }
- \tl_replace_all:Nox #1 { @ @ } { __ \g__codedoc_module_name_tl }
- }
- }
-\cs_generate_variant:Nn \tl_replace_all:Nnn { Non, Nox }
-\cs_new_protected:Nn \__codedoc_endmacro_build_seq:N
- {
- \seq_gclear:N #1
- \clist_map_inline:Nn \l__codedoc_macro_input_clist
- {
- \tl_set:Nn \l__codedoc_tmpa_tl {##1}
- \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
- \seq_gput_right:No #1 { \l__codedoc_tmpa_tl }
- }
- }
-\cs_set_protected:Nn \__codedoc_endmacro_wrap_each:N
- {
- \bool_if:NTF \l__codedoc_macro_TF_bool
- { \seq_gset_map:NNn #1 #1 { \exp_not:N \texttt { ##1 TF } } }
- { \seq_gset_map:NNn #1 #1 { \exp_not:N \texttt { ##1 } } }
- }
-\cs_set:Nn \__codedoc_texttt_comma:n {\,,~\texttt{#1}}
-\cs_set:Npn \endmacro
- {
- \int_compare:nT { \g__codedoc_nested_macro_int < 1 }
- {
- \par\nobreak\noindent{\footnotesize(\emph{
+ {
+ \seq_gput_right:Nx \g__codedoc_not_tested_seq
+ {
+ \seq_use:Nn \l__codedoc_macro_input_seq { , }
+ \bool_if:NTF \l__codedoc_macro_pTF_bool {~(pTF)}
+ { \bool_if:NT \l__codedoc_macro_TF_bool {~(TF)} }
+ }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_macro_end_style:n #1
+ {
+ \nobreak \noindent
+ { \footnotesize ( \emph{#1} ) \par }
+ }
+\cs_new_protected:Npn \__codedoc_macro_end_wrap_items:N #1
+ {
+ \bool_if:NT \l__codedoc_macro_TF_bool
+ { \seq_set_map:NNn #1 #1 { ##1 TF } }
+ \seq_set_map:NNn #1 #1
+ {
+ \exp_not:n
+ {
+ \tl_set:Nn \l__codedoc_tmpa_tl {##1}
+ \tl_replace_all:Non \l__codedoc_tmpa_tl
+ { \token_to_str:N _ } { \_ }
+ \texttt { \l__codedoc_tmpa_tl }
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_print_end_definition:
+ {
+ \group_begin:
+ \__codedoc_macro_end_wrap_items:N \l__codedoc_macro_input_seq
End~ definition~ for~
- \__codedoc_endmacro_build_seq:N \g__codedoc_tmpa_seq
- \__codedoc_endmacro_wrap_each:N \g__codedoc_tmpa_seq
- \int_compare:nTF { \seq_count:N \g__codedoc_tmpa_seq <= 3 }
+ \int_compare:nTF { \seq_count:N \l__codedoc_macro_input_seq <= 3 }
{
- \seq_use:Nnnn \g__codedoc_tmpa_seq
+ \seq_use:Nnnn \l__codedoc_macro_input_seq
{ \,~and~ } { \,,~ } { \,,~and~ }
\@.
}
- { \seq_item:Nn \g__codedoc_tmpa_seq {1}\,~and~others. }
-
+ { \seq_item:Nn \l__codedoc_macro_input_seq {1}\,~and~others. }
+ \group_end:
+ }
+\cs_new_protected_nopar:Npn \__codedoc_print_documented:
+ {
\bool_if:nT
- {
- !\l__codedoc_macro_aux_bool &&
- !\l__codedoc_macro_internal_bool &&
- \int_compare_p:n {\g__codedoc_nested_macro_int<1}
- }
- {
- \int_compare:nNnTF \l__codedoc_macro_int=1 {~This~} {~These~}
- \bool_if:NTF \l__codedoc_macro_var_bool{variable}{function}
- \int_compare:nNnTF \l__codedoc_macro_int=1 {~is~}{s~are~}
- documented~on~page~
- \exp_args:Nx\pageref{doc/function//\l__codedoc_macro_tl}.
- }
- })\par}
- }
-
- \bool_if:nT
- {
- \g__codedoc_checktest_bool &&
- !( \l__codedoc_macro_aux_bool || \l__codedoc_macro_var_bool ) &&
- !\l__codedoc_tested_bool
- }
- {
- \seq_gput_right:Nx \g__codedoc_not_tested_seq
- {
- \seq_use:Nnnn \g__codedoc_tmpa_seq { , } { , } { , }
- \bool_if:NT \l__codedoc_macro_pTF_bool {~(pTF)}
- \bool_if:NT \l__codedoc_macro_TF_bool {~(TF)}
- }
- }
- }
+ {
+ ! \l__codedoc_macro_aux_bool &&
+ ! \l__codedoc_macro_internal_bool
+ }
+ {
+ \int_set:Nn \l__codedoc_tmpa_int
+ { \seq_count:N \l__codedoc_macro_input_seq }
+ \int_compare:nNnTF \l__codedoc_tmpa_int = 1 {~This~} {~These~}
+ \bool_if:NTF \l__codedoc_macro_var_bool {variable} {function}
+ \int_compare:nNnTF \l__codedoc_tmpa_int = 1 {~is~} {s~are~}
+ documented~on~page~
+ \exp_args:Nx \__codedoc_get_hyper_target:nN
+ { \seq_item:Nn \l__codedoc_macro_input_seq { 1 } }
+ \l__codedoc_tmpa_tl
+ \exp_args:Nx \pageref { \l__codedoc_tmpa_tl } .
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_typeset_TF:
+ {
+ \hyperlink{explTF}
+ {
+ \color{black}
+ \itshape TF
+ \makebox[0pt][r]
+ {
+ \color{red}
+ \underline { \phantom{\itshape TF} \kern-0.1em }
+ }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_typeset_aux:n #1
+ {
+ { \color[gray]{0.7} #1 }
+ }
+\cs_new_protected:Npn \__codedoc_get_hyper_target:nN #1#2
+ {
+ \tl_set:Nx #2
+ {
+ \tl_to_str:n {#1}
+ \bool_if:NT \l__codedoc_macro_TF_bool { \tl_to_str:n {TF} }
+ }
+ \tl_replace_all:Nxn #2 { \iow_char:N \_ } { / }
+ \tl_remove_all:Nx #2 { \iow_char:N \\ }
+ \tl_put_left:Nn #2 { doc/function// }
+ }
+\newcommand*{\DescribeOption}
+ {
+ \leavevmode
+ \@bsphack
+ \begingroup
+ \MakePrivateLetters
+ \Describe@Option
+ }
+\newcommand*{\Describe@Option}[1]
+ {
+ \endgroup
+ \marginpar{
+ \raggedleft
+ \PrintDescribeEnv{#1}
+ }
+ \SpecialOptionIndex{#1}
+ \@esphack
+ \ignorespaces
+ }
+\newcommand*{\SpecialOptionIndex}[1]
+ {
+ \@bsphack
+ \begingroup
+ \HD@target
+ \let\HDorg@encapchar\encapchar
+ \edef\encapchar usage
+ {
+ \HDorg@encapchar hdclindex{\the\c@HD@hypercount}{usage}
+ }
+ \index
+ {
+ #1\actualchar{\protect\ttfamily#1}~(option)
+ \encapchar usage
+ }
+ \index
+ {
+ options:\levelchar#1\actualchar{\protect\ttfamily#1}
+ \encapchar usage
+ }
+ \endgroup
+ \@esphack
+ }
+\font \manual = manfnt \scan_stop:
+\cs_gset_nopar:Npn \dbend { {\manual\char127} }
+\newenvironment {danger}
+ {
+ \begin{trivlist}\item[]\noindent
+ \begingroup\hangindent=2pc\hangafter=-2
+ \cs_set_nopar:Npn \par{\endgraf\endgroup}
+ \hbox to0pt{\hskip-\hangindent\dbend\hfill}\ignorespaces
+ }
+ {
+ \par\end{trivlist}
+ }
+\newenvironment {ddanger}
+ {
+ \begin{trivlist}\item[]\noindent
+ \begingroup\hangindent=3.5pc\hangafter=-2
+ \cs_set_nopar:Npn \par{\endgraf\endgroup}
+ \hbox to0pt{\hskip-\hangindent\dbend\kern2pt\dbend\hfill}\ignorespaces
+ }{
+ \par\end{trivlist}
+ }
+\newenvironment{TemplateInterfaceDescription}[1]
+ {
+ \subsection{The~object~type~`#1'}
+ \begingroup
+ \@beginparpenalty\@M
+ \description
+ \def\TemplateArgument##1##2{\item[Arg:~##1]##2\par}
+ \def\TemplateSemantics
+ {
+ \enddescription\endgroup
+ \subsubsection*{Semantics:}
+ }
+ }
+ {
+ \par\bigskip
+ }
+\newenvironment{TemplateDescription}[2]
+ {
+ \subsection{The~template~`#2'~(object~type~#1)}
+ \subsubsection*{Attributes:}
+ \begingroup
+ \@beginparpenalty\@M
+ \description
+ \def\TemplateKey##1##2##3##4
+ {
+ \item[##1~(##2)]##3%
+ \ifx\TemplateKey##4\TemplateKey\else
+ \hfill\penalty500\hbox{}\hfill Default:~##4%
+ \nobreak\hskip-\parfillskip\hskip0pt\relax
+ \fi
+ \par
+ }
+ \def\TemplateSemantics
+ {
+ \enddescription\endgroup
+ \subsubsection*{Semantics~\&~Comments:}
+ }
+ }
+ { \par \bigskip }
+\newenvironment{InstanceDescription}[4][xxxxxxxxxxxxxxx]
+ {
+ \subsubsection{The~instance~`#3'~(template~#2/#4)}
+ \subsubsection*{Attribute~values:}
+ \begingroup
+ \@beginparpenalty\@M
+ \def\InstanceKey##1##2{\>\textbf{##1}\>##2\\}
+ \def\InstanceSemantics{\endtabbing\endgroup
+ \vskip-30pt\vskip0pt
+ \subsubsection*{Layout~description~\&~Comments:}}
+ \tabbing
+ xxxx\=#1\=\kill
+ }
+ { \par \bigskip }
+\DeclareDocumentCommand \OnlyDescription { }
+ { \bool_gset_false:N \g__codedoc_typeset_implementation_bool }
+\DeclareDocumentCommand \AlsoImplementation { }
+ { \bool_gset_true:N \g__codedoc_typeset_implementation_bool }
+\DeclareDocumentCommand \StopEventually { m }
+ {
+ \bool_if:NTF \g__codedoc_typeset_implementation_bool
+ {
+ \@bsphack
+ \tl_gset:Nn \g__codedoc_finale_tl { #1 \check@checksum }
+ \init@checksum
+ \@esphack
+ }
+ { #1 \endinput }
+ }
+\DeclareDocumentCommand \Finale { }
+ { \tl_use:N \g__codedoc_finale_tl }
+\tl_new:N \g__codedoc_finale_tl
+\cs_new_protected:Npn \__codedoc_input:n #1
+ {
+ \tl_gclear:N \g__codedoc_module_name_tl
+ \MakePercentIgnore
+ \input{#1}
+ \MakePercentComment
+ }
+\DeclareDocumentCommand \DocInput { m }
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \clist_put_right:Nn \g_docinput_clist {##1}
+ \__codedoc_input:n {##1}
+ }
+ }
+\DeclareDocumentCommand \DocInputAgain { }
+ { \clist_map_function:NN \g_docinput_clist \__codedoc_input:n }
+\NewDocumentCommand \DocInclude { m }
+ {
+ \relax\clearpage
+ \docincludeaux
+ \IfFileExists{#1.fdd}
+ { \cs_set_nopar:Npn \currentfile{#1.fdd} }
+ { \cs_set_nopar:Npn \currentfile{#1.dtx} }
+ \int_compare:nNnTF \@auxout = \@partaux
+ { \@latexerr{\string\include\space cannot~be~nested}\@eha }
+ { \@docinclude #1 }
+ }
+\cs_gset:Npn \@docinclude #1
+ {
+ \clearpage
+ \immediate\write\@mainaux{\string\@input{#1.aux}}
+ \@tempswatrue
+ \if@partsw
+ \@tempswafalse
+ \cs_set_nopar:Npx \@tempb{#1}
+ \@for\@tempa:=\@partlist\do
+ {
+ \ifx\@tempa\@tempb\@tempswatrue\fi
+ }
+ \fi
+ \if@tempswa
+ \cs_set_eq:NN \@auxout \@partaux
+ \immediate\openout\@partaux #1.aux
+ \immediate\write\@partaux{\relax}
+ \cs_set_eq:NN \@ltxdoc@PrintIndex \PrintIndex
+ \cs_set_eq:NN \PrintIndex \relax
+ \cs_set_eq:NN \@ltxdoc@PrintChanges \PrintChanges
+ \cs_set_eq:NN \PrintChanges \relax
+ \cs_set_eq:NN \@ltxdoc@theglossary \theglossary
+ \cs_set_eq:NN \@ltxdoc@endtheglossary \endtheglossary
+ \part{\currentfile}
+ {
+ \cs_set_eq:NN \ttfamily\relax
+ \cs_gset_nopar:Npx \filekey
+ { \filekey, \thepart = { \ttfamily \currentfile } }
+ }
+ \DocInput{\currentfile}
+ \cs_set_eq:NN \PrintIndex \@ltxdoc@PrintIndex
+ \cs_set_eq:NN \PrintChanges \@ltxdoc@PrintChanges
+ \cs_set_eq:NN \theglossary \@ltxdoc@theglossary
+ \cs_set_eq:NN \endtheglossary \@ltxdoc@endtheglossary
+ \clearpage
+ \@writeckpt{#1}
+ \immediate \closeout \@partaux
+ \else
+ \@nameuse{cp@#1}
+ \fi
+ \cs_set_eq:NN \@auxout \@mainaux
+ }
+\cs_gset:Npn \codeline@wrindex #1
+ {
+ \immediate\write\@indexfile
+ {
+ \string\indexentry{#1}
+ { \filesep \int_use:N \c@CodelineNo }
+ }
+ }
+\tl_gclear:N \filesep
+\cs_gset_nopar:Npn \docincludeaux
+ {
+ \tl_set:Nn \thepart { \alphalph { part } }
+ \tl_set:Nn \filesep { \thepart - }
+ \cs_set_eq:NN \filekey \use_none:n
+ \tl_gput_right:Nn \index@prologue
+ {
+ \cs_gset_nopar:Npn \@oddfoot
+ {
+ \parbox { \textwidth }
+ {
+ \strut \footnotesize
+ \raggedright { \bfseries File~Key: } ~ \filekey
+ }
+ }
+ \cs_set_eq:NN \@evenfoot \@oddfoot
+ }
+ \cs_gset_eq:NN \docincludeaux \relax
+ \cs_gset_nopar:Npn \@oddfoot
+ {
+ \cs_if_exist:cTF { ver @ \currentfile }
+ { File~\thepart :~{\ttfamily\currentfile}~ }
+ {
+ \GetFileInfo{\currentfile}
+ File~\thepart :~{\ttfamily\filename}~
+ Date:~\ExplFileDate\ % space
+ Version~\ExplFileVersion
+ }
+ \hfill \thepage
+ }
+ \cs_set_eq:NN \@evenfoot \@oddfoot
+ }
\group_begin:
\char_set_catcode_escape:N \/
\char_set_catcode_other:N \^^A
@@ -1007,457 +1410,371 @@
\char_set_lccode:nn { `\^^L } { `\{ }
\char_set_lccode:nn { `\^^R } { `\} }
\tl_to_lowercase:n
- {
- \group_end:
- \cs_set_protected:Npn \xmacro@code
- #1 ^^A ^^S^^S^^S^^S ^^Bend ^^Lmacrocode^^R
- { \__codedoc_xmacro_code:n {#1} /end{macrocode} }
- }
+ {
+ \group_end:
+ \cs_set_protected:Npn \xmacro@code
+ #1 ^^A ^^S^^S^^S^^S ^^Bend ^^Lmacrocode^^R
+ { \__codedoc_xmacro_code:n {#1} /end{macrocode} }
+ }
\group_begin:
\char_set_catcode_active:N \<
\char_set_catcode_active:N \>
\cs_new_protected:Npn \__codedoc_xmacro_code:n #1
- {
- \tl_if_in:nnTF {#1} { < @ @ = }
- { \__codedoc_xmacro_code:w #1 \q_stop }
- {
+ {
+ \tl_if_in:nnTF {#1} { < @ @ = }
+ { \__codedoc_xmacro_code:w #1 \q_stop }
+ {
+ \tl_set:Nn \l__codedoc_tmpa_tl {#1}
+ \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
+ \tl_use:N \l__codedoc_tmpa_tl
+ }
+ }
+ \cs_new_protected:Npn \__codedoc_xmacro_code:w #1 < @ @ = #2 > #3 \q_stop
+ {
\tl_set:Nn \l__codedoc_tmpa_tl {#1}
\__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
- \tl_use:N \l__codedoc_tmpa_tl
- }
- }
- \cs_new_protected:Npn \__codedoc_xmacro_code:w #1 < @ @ = #2 > #3 \q_stop
- {
- \tl_set:Nn \l__codedoc_tmpa_tl {#1}
- \__codedoc_replace_at_at:N \l__codedoc_tmpa_tl
- \tl_gset:Nn \g__codedoc_module_name_tl {#2}
- \tl_put_right:Nn \l__codedoc_tmpa_tl { < @ @ = #2 > }
+ \tl_gset:Nn \g__codedoc_module_name_tl {#2}
+ \tl_put_right:Nn \l__codedoc_tmpa_tl { < @ @ = #2 > }
- \tl_set:Nn \l__codedoc_tmpb_tl {#3}
- \__codedoc_replace_at_at:N \l__codedoc_tmpb_tl
- \tl_put_right:No \l__codedoc_tmpa_tl { \l__codedoc_tmpb_tl }
+ \tl_set:Nn \l__codedoc_tmpb_tl {#3}
+ \__codedoc_replace_at_at:N \l__codedoc_tmpb_tl
+ \tl_put_right:No \l__codedoc_tmpa_tl { \l__codedoc_tmpb_tl }
- \tl_use:N \l__codedoc_tmpa_tl
- }
+ \tl_use:N \l__codedoc_tmpa_tl
+ }
\group_end:
-\newcommand*{\DescribeOption}
- {
- \leavevmode
- \@bsphack
- \begingroup
- \MakePrivateLetters
- \Describe@Option
- }
-\newcommand*{\Describe@Option}[1]
- {
- \endgroup
- \marginpar{
- \raggedleft
- \PrintDescribeEnv{#1}
- }
- \SpecialOptionIndex{#1}
- \@esphack
- \ignorespaces
- }
-\newcommand*{\SpecialOptionIndex}[1]
- {
- \@bsphack
- \begingroup
- \HD@target
- \let\HDorg@encapchar\encapchar
- \edef\encapchar usage
- {
- \HDorg@encapchar hdclindex{\the\c@HD@hypercount}{usage}
- }
- \index
- {
- #1\actualchar{\protect\ttfamily#1}~(option)
- \encapchar usage
- }
- \index
- {
- options:\levelchar#1\actualchar{\protect\ttfamily#1}
- \encapchar usage
- }
- \endgroup
- \@esphack
- }
-\font\manual=manfnt
-\cs_set_nopar:Npn \dbend { {\manual\char127} }
-\newenvironment {danger}
- {
- \begin{trivlist}\item[]\noindent
- \begingroup\hangindent=2pc\hangafter=-2
- \cs_set_nopar:Npn \par{\endgraf\endgroup}
- \hbox to0pt{\hskip-\hangindent\dbend\hfill}\ignorespaces
- }
- {
- \par\end{trivlist}
- }
-\newenvironment {ddanger}
- {
- \begin{trivlist}\item[]\noindent
- \begingroup\hangindent=3.5pc\hangafter=-2
- \cs_set_nopar:Npn \par{\endgraf\endgroup}
- \hbox to0pt{\hskip-\hangindent\dbend\kern2pt\dbend\hfill}\ignorespaces
- }{
- \par\end{trivlist}
- }
-\newenvironment{TemplateInterfaceDescription}[1]
- {
- \subsection{The~object~type~`#1'}
- \begingroup
- \@beginparpenalty\@M
- \description
- \def\TemplateArgument##1##2{\item[Arg:~##1]##2\par}
- \def\TemplateSemantics
- {
- \enddescription\endgroup
- \subsubsection*{Semantics:}
- }
- }
- {
- \par\bigskip
- }
-\newenvironment{TemplateDescription}[2]
+\iow_new:N \g__codedoc_func_iow
+\tl_new:N \l__codedoc_doc_def_tl
+\tl_new:N \l__codedoc_doc_undef_tl
+\tl_new:N \l__codedoc_undoc_def_tl
+\cs_new_protected_nopar:Npn \__codedoc_show_functions_defined:
{
- \subsection{The~template~`#2'~(object~type~#1)}
- \subsubsection*{Attributes:}
- \begingroup
- \@beginparpenalty\@M
- \description
- \def\TemplateKey##1##2##3##4
- {
- \item[##1~(##2)]##3%
- \ifx\TemplateKey##4\TemplateKey\else
- \hfill\penalty500\hbox{}\hfill Default:~##4%
- \nobreak\hskip-\parfillskip\hskip0pt\relax
- \fi
- \par
- }
- \def\TemplateSemantics
- {
- \enddescription\endgroup
- \subsubsection*{Semantics~\&~Comments:}
- }
+ \bool_if:nT
+ { \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 }
+
+ \tl_clear:N \l__codedoc_doc_def_tl
+ \tl_clear:N \l__codedoc_doc_undef_tl
+ \tl_clear:N \l__codedoc_undoc_def_tl
+ \seq_map_inline:Nn \g_doc_functions_seq
+ {
+ \seq_if_in:NnTF \g_doc_macros_seq {##1}
+ {
+ \tl_put_right:Nx \l__codedoc_doc_def_tl
+ { ##1 \iow_newline: }
+ \iow_now:Nn \g__codedoc_func_iow { > ~ ##1 }
+ }
+ {
+ \tl_put_right:Nx \l__codedoc_doc_undef_tl
+ { ##1 \iow_newline: }
+ \iow_now:Nn \g__codedoc_func_iow { ! ~ ##1 }
+ }
+ }
+ \seq_map_inline:Nn \g_doc_macros_seq
+ {
+ \seq_if_in:NnF \g_doc_functions_seq {##1}
+ {
+ \tl_put_right:Nx \l__codedoc_undoc_def_tl
+ { ##1 \iow_newline: }
+ \iow_now:Nn \g__codedoc_func_iow { ? ~ ##1 }
+ }
+ }
+ \__codedoc_functions_typeout:nN
+ {
+ Functions~both~documented~and~defined: \iow_newline:
+ (In~order~of~being~documented)
+ }
+ \l__codedoc_doc_def_tl
+ \__codedoc_functions_typeout:nN
+ { Functions~documented~but~not~defined: }
+ \l__codedoc_doc_undef_tl
+ \__codedoc_functions_typeout:nN
+ { Functions~defined~but~not~documented: }
+ \l__codedoc_undoc_def_tl
+
+ \iow_close:N \g__codedoc_func_iow
+ \iow_term:x { \c__codedoc_iow_separator_tl }
+ }
}
- {\par\bigskip}
-\newenvironment{InstanceDescription}[4][xxxxxxxxxxxxxxx]
+\AtEndDocument { \__codedoc_show_functions_defined: }
+\cs_new_protected:Npn \__codedoc_functions_typeout:nN #1#2
+ {
+ \tl_if_empty:NF #2
+ {
+ \typeout
+ {
+ \c__codedoc_iow_midrule_tl \iow_newline:
+ #1 \iow_newline:
+ \c__codedoc_iow_midrule_tl \iow_newline:
+ #2
+ }
+ \tl_clear:N #2
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_show_not_tested:
+ {
+ \bool_if:NT \g__codedoc_checktest_bool
+ {
+ \tl_clear:N \l__codedoc_tmpa_tl
+ \prop_if_empty:NF \g__codedoc_missing_tests_prop
+ {
+ \cs_set:Npn \__codedoc_tmpa:w ##1##2
+ {
+ \iow_newline:
+ \space\space\space\space \exp_not:n {##1}
+ \clist_map_function:nN {##2} \__codedoc_tmpb:w
+ }
+ \cs_set:Npn \__codedoc_tmpb:w ##1
+ {
+ \iow_newline:
+ \space\space\space\space\space\space * ~ ##1
+ }
+ \tl_put_right:Nx \l__codedoc_tmpa_tl
+ {
+ \iow_newline: \iow_newline:
+ The~ following~ macro(s)~ have~ incomplete~ tests:
+ \iow_newline:
+ \prop_map_function:NN
+ \g__codedoc_missing_tests_prop \__codedoc_tmpa:w
+ }
+ }
+ \seq_if_empty:NF \g__codedoc_not_tested_seq
+ {
+ \cs_set:Npn \__codedoc_tmpa:w ##1
+ { \clist_map_function:nN {##1} \__codedoc_tmpb:w }
+ \cs_set:Npn \__codedoc_tmpb:w ##1
+ {
+ \iow_newline:
+ \space\space\space\space ##1
+ }
+ \tl_put_right:Nx \l__codedoc_tmpa_tl
+ {
+ \iow_newline:
+ \iow_newline:
+ The~ following~ macro(s)~ do~ not~ have~ any~ tests:
+ \iow_newline:
+ \seq_map_function:NN
+ \g__codedoc_not_tested_seq \__codedoc_tmpa:w
+ }
+ }
+ \tl_if_empty:NF \l__codedoc_tmpa_tl
+ {
+ \int_set:Nn \l__codedoc_tmpa_int { \etex_interactionmode:D }
+ \errorstopmode
+ \ClassError { l3doc } { \l__codedoc_tmpa_tl } { }
+ \int_set:Nn \etex_interactionmode:D { \l__codedoc_tmpa_int }
+ }
+ }
+ }
+\AtEndDocument { \__codedoc_show_not_tested: }
+\g@addto@macro \theindex { \MakePrivateLetters }
+\cs_gset:Npn \verbatimchar {&}
+\setcounter { IndexColumns } { 2 }
+\IndexPrologue
+ {
+ \part*{Index}
+ \markboth{Index}{Index}
+ \addcontentsline{toc}{part}{Index}
+ The~italic~numbers~denote~the~pages~where~the~
+ corresponding~entry~is~described,~
+ numbers~underlined~point~to~the~definition,~
+ all~others~indicate~the~places~where~it~is~used.
+ }
+\cs_gset_protected:Npn \SpecialIndex #1
{
- \subsubsection{The~instance~`#3'~(template~#2/#4)}
- \subsubsection*{Attribute~values:}
- \begingroup
- \@beginparpenalty\@M
- \def\InstanceKey##1##2{\>\textbf{##1}\>##2\\}
- \def\InstanceSemantics{\endtabbing\endgroup
- \vskip-30pt\vskip0pt
- \subsubsection*{Layout~description~\&~Comments:}}
- \tabbing
- xxxx\=#1\=\kill
- }
- {\par\bigskip}
-\cs_set_nopar:Npn \AlsoImplementation
- {
- \bool_set_true:N \g__codedoc_implementation_bool
- \cs_set:Npn \StopEventually ##1
- {
\@bsphack
- \cs_gset_nopar:Npn \Finale { ##1 \check@checksum }
- \init@checksum
+ \__codedoc_special_index:nn {#1} { }
\@esphack
- }
- }
-\AlsoImplementation
-\cs_set_nopar:Npn \OnlyDescription
- {
- \@bsphack
- \bool_set_false:N \g__codedoc_implementation_bool
- \cs_set:Npn \StopEventually ##1 { ##1 \endinput }
- \@esphack
- }
-\cs_set_eq:NN \Finale \relax
-\cs_set_nopar:Npn \partname{File}
-\cs_set:Npn \DocInput #1
- {
- \clist_map_inline:nn {#1}
- {
- \clist_put_right:Nn \g_docinput_clist {##1}
- \tl_gclear:N \g__codedoc_module_name_tl
- \MakePercentIgnore
- \input{##1}
- \MakePercentComment
- }
- }
-\cs_set:Npn \DocInputAgain
- {
- \clist_map_inline:Nn \g_docinput_clist
- {
- \MakePercentIgnore
- \tl_gclear:N \g__codedoc_module_name_tl
- \input{##1}
- \MakePercentComment
- }
- }
-\cs_set_nopar:Npn \partname{File}
-\newcommand*{\DocInclude}[1]
- {
- \relax\clearpage
- \docincludeaux
- \IfFileExists{#1.fdd}
- { \cs_set_nopar:Npn \currentfile{#1.fdd} }
- { \cs_set_nopar:Npn \currentfile{#1.dtx} }
- \ifnum\@auxout=\@partaux
- \@latexerr{\string\include\space cannot~be~nested}\@eha
- \else
- \@docinclude #1
- \fi
- }
-\cs_set_nopar:Npn \@docinclude #1
- {
- \clearpage
- \immediate\write\@mainaux{\string\@input{#1.aux}}
- \@tempswatrue
- \if@partsw
- \@tempswafalse
- \cs_set_nopar:Npx \@tempb{#1}
- \@for\@tempa:=\@partlist\do
- {
- \ifx\@tempa\@tempb\@tempswatrue\fi
- }
- \fi
- \if@tempswa
- \cs_set_eq:NN \@auxout\@partaux
- \immediate\openout\@partaux #1.aux
- \immediate\write\@partaux{\relax}
- \cs_set_eq:NN \@ltxdoc@PrintIndex\PrintIndex
- \cs_set_eq:NN \PrintIndex\relax
- \cs_set_eq:NN \@ltxdoc@PrintChanges\PrintChanges
- \cs_set_eq:NN \PrintChanges\relax
- \cs_set_eq:NN \@ltxdoc@theglossary\theglossary
- \cs_set_eq:NN \@ltxdoc@endtheglossary\endtheglossary
- \part{\currentfile}
- {
- \cs_set_eq:NN \ttfamily\relax
- \cs_gset_nopar:Npx \filekey{\filekey, \thepart={\ttfamily\currentfile}}
- }
- \DocInput{\currentfile}
- \cs_set_eq:NN \PrintIndex\@ltxdoc@PrintIndex
- \cs_set_eq:NN \PrintChanges\@ltxdoc@PrintChanges
- \cs_set_eq:NN \theglossary\@ltxdoc@theglossary
- \cs_set_eq:NN \endtheglossary\@ltxdoc@endtheglossary
- \clearpage
- \@writeckpt{#1}
- \immediate\closeout\@partaux
- \else
- \@nameuse{cp@#1}
- \fi
- \cs_set_eq:NN \@auxout\@mainaux
- }
-\cs_gset_nopar:Npn \codeline@wrindex #1
- {
- \immediate\write\@indexfile
- {
- \string\indexentry{#1}
- { \filesep \int_use:N \c@CodelineNo }
- }
- }
-\cs_set_eq:NN \filesep \@empty
-\cs_set_nopar:Npn \docincludeaux
- {
- \cs_set_nopar:Npn \thepart {\alphalph{part}}
- \cs_set_nopar:Npn \filesep {\thepart-}
- \cs_set_eq:NN \filekey\@gobble
- \g@addto@macro\index@prologue
- {
- \cs_gset_nopar:Npn\@oddfoot
- {
- \parbox{\textwidth}
- {
- \strut\footnotesize
- \raggedright{\bfseries File~Key:}~\filekey
- }
- }
- \cs_set_eq:NN \@evenfoot\@oddfoot
- }
- \cs_gset_eq:NN \docincludeaux\relax
- \cs_gset_nopar:Npn\@oddfoot
- {
- \expandafter\ifx\csname ver@\currentfile\endcsname\relax
- File~\thepart :~{\ttfamily\currentfile}~
- \else
- \GetFileInfo{\currentfile}
- File~\thepart :~{\ttfamily\filename}~
- Date:~\ExplFileDate\ % space
- Version~\ExplFileVersion
- \fi
- \hfill\thepage
- }
- \cs_set_eq:NN \@evenfoot \@oddfoot
- }
-\iow_new:N \g__codedoc_func_iow
-\cs_new_nopar:Npn \__codedoc_show_functions_defined:
- {
- \bool_if:nT { \g__codedoc_implementation_bool && \g__codedoc_checkfunc_bool }
- {
- \typeout{ ======================================== ^^J }
- \iow_open:Nn \g__codedoc_func_iow { \c_job_name_tl .cmds }
-
- \tl_clear:N \l__codedoc_tmpa_tl
- \seq_map_inline:Nn \g_doc_functions_seq
- {
- \seq_if_in:NnT \g_doc_macros_seq {##1}
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl { ##1 ^^J }
- \iow_now:Nn \g__codedoc_func_iow { > ~ ##1 }
- }
- }
-
- \__codedoc_functions_typeout:n
- {
- Functions~both~documented~and~defined:^^J
- (In~order~of~being~documented)
- }
-
- \seq_map_inline:Nn \g_doc_functions_seq
- {
- \seq_if_in:NnF \g_doc_macros_seq {##1}
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl { ##1 ^^J }
- \iow_now:Nn \g__codedoc_func_iow { ! ~ ##1}
- }
- }
- \__codedoc_functions_typeout:n { Functions~documented~but~not~defined: }
-
- \seq_map_inline:Nn \g_doc_macros_seq
- {
- \seq_if_in:NnF \g_doc_functions_seq {##1}
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl { ##1 ^^J }
- \iow_now:Nn \g__codedoc_func_iow { ? ~ ##1}
- }
- }
- \__codedoc_functions_typeout:n { Functions~defined~but~not~documented: }
-
- \iow_close:N \g__codedoc_func_iow
- \typeout{ ======================================== }
- }
-}
-\AtEndDocument{ \__codedoc_show_functions_defined: }
-\cs_set_nopar:Npn \__codedoc_functions_typeout:n #1
- {
- \tl_if_empty:NF \l__codedoc_tmpa_tl
- {
- \typeout
- {
- -------------------------------------- ^^J #1 ^^J
- -------------------------------------- ^^J \l__codedoc_tmpa_tl
- }
- \tl_clear:N \l__codedoc_tmpa_tl
- }
- }
-\cs_new:Npn \__codedoc_show_not_tested:
- {
- \bool_if:NT \g__codedoc_checktest_bool
- {
- \bool_if:nT { !(\seq_if_empty_p:N \g__codedoc_not_tested_seq) ||
- !(\prop_if_empty_p:N \g__codedoc_missing_tests_prop) }
- {
- \tl_clear:N \l__codedoc_tmpa_tl
- \prop_if_empty:NF \g__codedoc_missing_tests_prop
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl
- {
- ^^J^^JThe~ following~ macro(s)~ have~ incomplete~ tests:^^J
- }
- \prop_map_inline:Nn \g__codedoc_missing_tests_prop
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl
- {^^J\space\space\space\space ##1
- ^^J\space\space\space\space\space\space ##2}
- }
- }
- \seq_if_empty:NF \g__codedoc_not_tested_seq
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl
- {
- ^^J^^J
- The~ following~ macro(s)~ do~ not~ have~ any~ tests:^^J
- }
- \seq_map_inline:Nn \g__codedoc_not_tested_seq
- {
- \clist_map_inline:nn {##1}
- {
- \tl_put_right:Nn \l__codedoc_tmpa_tl {^^J\space\space\space\space ####1}
- }
- }
- \int_set:Nn \l_tmpa_int {\etex_interactionmode:D}
- \errorstopmode
- \ClassError{l3doc}{\l__codedoc_tmpa_tl}{}
- \int_set:Nn \etex_interactionmode:D {\l_tmpa_int}
- }
- }
- }
- }
-\AtEndDocument{ \__codedoc_show_not_tested: }
-\g@addto@macro\theindex{\MakePrivateLetters}
-\cs_set:Npn \verbatimchar {&}
-\setcounter{IndexColumns}{2}
-\IndexPrologue
- {
- \part*{Index}
- \markboth{Index}{Index}
- \addcontentsline{toc}{part}{Index}
- The~italic~numbers~denote~the~pages~where~the~
- corresponding~entry~is~described,~
- numbers~underlined~point~to~the~definition,~
- all~others~indicate~the~places~where~it~is~used.
- }
-
-\cs_set_nopar:Npn \__codedoc_special_main_index:n #1
- {
- \HD@target
- \index
- {
- \@gobble#1
- \actualchar
- \string\verb\quotechar*\verbatimchar#1\verbatimchar
- \encapchar
- hdclindex{\the\c@HD@hypercount}{usage}
- }
- }
-\cs_generate_variant:Nn \__codedoc_special_main_index:n { o , x }
-\msg_new:nnn {l3doc} {print-index-howto}
- {
- Generate~the~index~by~executing\\
- \iow_indent:n { makeindex~-s~gind.ist~-o~\c_job_name_tl .ind~\c_job_name_tl .idx }
- }
-\tl_gput_right:Nn \PrintIndex { \AtEndDocument{ \msg_info:nn {l3doc} {print-index-howto} } }
+ }
+\msg_new:nnn { l3doc } { print-index-howto }
+ {
+ Generate~the~index~by~executing\\
+ \iow_indent:n
+ { makeindex~-s~gind.ist~-o~\c_job_name_tl.ind~\c_job_name_tl.idx }
+ }
+\tl_gput_right:Nn \PrintIndex
+ { \AtEndDocument { \msg_info:nn { l3doc } { print-index-howto } } }
+\cs_gset_protected:Npn \it@is@a #1
+ {
+ \use:x
+ {
+ \__codedoc_special_index_module:nnnn
+ { \quotechar #1 }
+ { \quotechar \bslash \quotechar #1 }
+ { }
+ { }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_special_index:nn #1#2
+ {
+ \__codedoc_key_get:n {#1}
+ \__codedoc_special_index_module:ooon
+ { \l__codedoc_index_key_tl }
+ { \l__codedoc_index_macro_tl }
+ { \l__codedoc_index_module_tl }
+ {#2}
+ }
+\cs_generate_variant:Nn \__codedoc_special_index:nn { o }
+\tl_new:N \l__codedoc_index_escaped_macro_tl
+\cs_new_protected:Npn \__codedoc_special_index_module:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \exp_not:n { \__codedoc_special_index_aux:nnnnn {#1} {#2} }
+ \str_case_x:nnF {#3}
+ {
+ { } { { } { } }
+ { TeX }
+ {
+ { TeX~and~LaTeX2e~commands }
+ { \string\TeX{}~and~\string\LaTeXe{}~commands: }
+ }
+ }
+ { { #3~commands } { \string\pkg{#3}~commands: } }
+ }
+ {#4}
+ }
+\cs_generate_variant:Nn \__codedoc_special_index_module:nnnn { ooo }
+\cs_new_protected:Npn \__codedoc_special_index_aux:nnnnn #1#2#3#4#5
+ {
+ \HD@target
+ \__codedoc_special_index_set:Nn \l__codedoc_index_escaped_macro_tl {#2}
+ \index
+ {
+ \tl_if_empty:nF { #3 #4 }
+ { #3 \actualchar #4 \levelchar }
+ #1
+ \actualchar
+ {
+ \token_to_str:N \verbatim@font \c_space_tl
+ \l__codedoc_index_escaped_macro_tl
+ }
+ \encapchar
+ hdclindex{\the\c@HD@hypercount}{#5}
+ }
+ }
+\cs_generate_variant:Nn \__codedoc_special_index_aux:nnnnn { o }
+\cs_new_protected:Npn \__codedoc_special_index_set:Nn #1#2
+ {
+ \tl_set:Nx #1 { \tl_to_str:n {#2} }
+ \int_compare:nNnTF { \tl_count:n {#2} } < { \tl_count:N #1 }
+ {
+ \tl_set:Nn #1 {#2}
+ \tl_replace_all:Non #1
+ { \c__codedoc_backslash_tl }
+ { \token_to_str:N \bslash \c_space_tl }
+ }
+ {
+ \exp_args:Nx \tl_map_inline:nn
+ { \tl_to_str:N \verbatimchar \token_to_str:N _ }
+ {
+ \tl_replace_all:Nnn #1 {##1}
+ {
+ \verbatimchar \c__codedoc_backslash_tl ##1
+ \token_to_str:N \verb \quotechar * \verbatimchar
+ }
+ }
+ \tl_map_inline:nn { \actualchar \encapchar \levelchar }
+ {
+ \tl_replace_all:Nxn #1
+ { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
+ }
+ \tl_set:Nx #1
+ {
+ \token_to_str:N \verb \quotechar * \verbatimchar
+ #1 \verbatimchar
+ }
+ }
+ }
+\cs_new_protected:Npn \__codedoc_key_get:n #1
+ {
+ \tl_set:Nn \l__codedoc_index_macro_tl {#1}
+ \tl_set:Nx \l__codedoc_index_key_tl { \tl_to_str:n {#1} }
+ \tl_clear:N \l__codedoc_index_module_tl
+ \tl_if_head_eq_charcode:oNT
+ { \l__codedoc_index_key_tl } \c__codedoc_backslash_token
+ { \__codedoc_key_pop: }
+ \tl_if_in:NoTF \l__codedoc_index_key_tl { \token_to_str:N : }
+ { \__codedoc_key_expl: }
+ {
+ \tl_if_in:NoTF \l__codedoc_index_key_tl { \token_to_str:N _ }
+ { \__codedoc_key_expl: }
+ {
+ \tl_if_in:NoT \l__codedoc_index_key_tl { \token_to_str:N @ }
+ { \tl_set:Nn \l__codedoc_index_module_tl { TeX } }
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_key_pop:
+ {
+ \tl_set:Nx \l__codedoc_index_key_tl
+ { \tl_tail:N \l__codedoc_index_key_tl }
+ }
+\cs_new_protected_nopar:Npn \__codedoc_key_expl:
+ {
+ \tl_if_head_eq_charcode:oNTF { \l__codedoc_index_key_tl } .
+ { \__codedoc_key_pop: }
+ {
+ \exp_args:Nx \tl_if_head_eq_charcode:nNT
+ { \exp_args:No \str_tail:n \l__codedoc_index_key_tl } _
+ {
+ \tl_if_head_eq_charcode:oNTF { \l__codedoc_index_key_tl } _
+ {
+ \__codedoc_key_pop:
+ \__codedoc_key_pop:
+ }
+ {
+ \__codedoc_key_pop:
+ \__codedoc_key_pop:
+ \tl_if_head_eq_charcode:oNT { \l__codedoc_index_key_tl } _
+ { \__codedoc_key_pop: }
+ }
+ }
+ }
+ \__codedoc_key_get_module:
+ }
+\cs_new_protected_nopar:Npn \__codedoc_key_get_module:
+ {
+ \tl_set_eq:NN \l__codedoc_index_module_tl \l__codedoc_index_key_tl
+ \exp_args:No \__codedoc_key_get_module_aux:n { \token_to_str:N : }
+ \exp_args:No \__codedoc_key_get_module_aux:n { \token_to_str:N _ }
+ }
+\cs_new_protected:Npn \__codedoc_key_get_module_aux:n #1
+ {
+ \cs_set:Npn \__codedoc_tmpa:w ##1 #1 ##2 \q_stop { \exp_not:n {##1} }
+ \tl_set:Nx \l__codedoc_index_module_tl
+ { \exp_after:wN \__codedoc_tmpa:w \l__codedoc_index_module_tl #1 \q_stop }
+ }
\GlossaryPrologue
- {
- \part*{Change~History}
- {\GlossaryParms\ttfamily\hyphenchar\font=`\-}
- \markboth{Change~History}{Change~History}
- \addcontentsline{toc}{part}{Change~History}
- }
-\msg_new:nnn {l3doc} {print-changes-howto}
- {
- Generate~the~change~list~by~executing\\
- \iow_indent:n { makeindex~-s~gglo.ist~-o~\c_job_name_tl .gls~\c_job_name_tl .glo }
- }
-\tl_gput_right:Nn \PrintChanges { \AtEndDocument{ \msg_info:nn {l3doc} {print-changes-howto} } }
-\bool_if:NTF \g__codedoc_full_bool
- {
- \RecordChanges
- \CodelineIndex
- \EnableCrossrefs
- \AlsoImplementation
- }
- {
- \CodelineNumbered
- \DisableCrossrefs
- \OnlyDescription
- }
+ {
+ \part*{Change~History}
+ {\GlossaryParms\ttfamily\hyphenchar\font=`\-}
+ \markboth{Change~History}{Change~History}
+ \addcontentsline{toc}{part}{Change~History}
+ }
+\msg_new:nnn { l3doc } { print-changes-howto }
+ {
+ Generate~the~change~list~by~executing\\
+ \iow_indent:n
+ { makeindex~-s~gglo.ist~-o~\c_job_name_tl.gls~\c_job_name_tl.glo }
+ }
+\tl_gput_right:Nn \PrintChanges
+ { \AtEndDocument { \msg_info:nn { l3doc } { print-changes-howto } } }
+\bool_if:NTF \g__codedoc_typeset_implementation_bool
+ {
+ \RecordChanges
+ \CodelineIndex
+ \EnableCrossrefs
+ \AlsoImplementation
+ }
+ {
+ \CodelineNumbered
+ \DisableCrossrefs
+ \OnlyDescription
+ }
%%
%%
%% End of file `l3doc.cls'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 39085843be6..fdceac1a81e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5203 2014-07-15 08:59:02Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 5308 2014-08-20 01:22:39Z bruno $
{L3 Experimental drivers}
\ProvidesExplFile
{l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index dd81247dddc..8b55e3715fd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5203 2014-07-15 08:59:02Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 5308 2014-08-20 01:22:39Z bruno $
{L3 Experimental drivers}
\ProvidesExplFile
{l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index 2f90a67e3a0..0e1f866ebeb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5203 2014-07-15 08:59:02Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 5308 2014-08-20 01:22:39Z bruno $
{L3 Experimental drivers}
\ProvidesExplFile
{l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def b/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def
index 6d5625134b3..203ab7da3c4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def
@@ -1,4 +1,4 @@
-\ProvidesExplFile {l3unicode-data.def} {2014/06/30} {5166} {L3 Unicode data}
+\ProvidesExplFile {l3unicode-data.def} {2014/08/12} {5276} {L3 Unicode data}
\clist_const:Nn \c__tl_after_final_sigma_clist
{ 0021 , 0022 , 0029 , 002C , 002E , 003A , 003B , 003F , 005D , 007D }
\clist_const:Nn \c__tl_mixed_skip_clist
@@ -17,10 +17,10 @@
}
\cs_set_protected:Npn \__unicode_tmp:NNNNNNN #1#2#3#4#5#6#7
{
- \tl_const:cx { c__str_fold_ #1 _ #2 _ tl }
+ \tl_const:cx { c__str_fold_ #1 _X_ #2 _ tl }
{ \tl_to_str:n { #6#7 } }
- \tl_const:cn { c__tl_lower_ #1 _ #2 _ tl } { #6#7 }
- \tl_const:cn { c__tl_upper_ #4 _ #5 _ tl } { #7#6 }
+ \tl_const:cn { c__tl_lower_ #1 _X_ #2 _ tl } { #6#7 }
+ \tl_const:cn { c__tl_upper_ #4 _X_ #5 _ tl } { #7#6 }
}
\__unicode_tmp:NN
AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz
@@ -30,17 +30,17 @@
{
\int_step_inline:nnnn { 0 } { 1 } { 9 }
{
- \tl_if_exist:cF { c__str_fold_ #1 _ ##1 _ tl }
+ \tl_if_exist:cF { c__str_fold_ #1 _X_ ##1 _ tl }
{
- \tl_const:cn { c__str_fold_ #1 _ ##1 _ tl } { }
+ \tl_const:cn { c__str_fold_ #1 _X_ ##1 _ tl } { }
}
- \tl_if_exist:cF { c__tl_lower_ #1 _ ##1 _ tl }
+ \tl_if_exist:cF { c__tl_lower_ #1 _X_ ##1 _ tl }
{
- \tl_const:cn { c__tl_lower_ #1 _ ##1 _ tl } { }
+ \tl_const:cn { c__tl_lower_ #1 _X_ ##1 _ tl } { }
}
- \tl_if_exist:cF { c__tl_upper_ #1 _ ##1 _ tl }
+ \tl_if_exist:cF { c__tl_upper_ #1 _X_ ##1 _ tl }
{
- \tl_const:cn { c__tl_upper_ #1 _ ##1 _ tl } { }
+ \tl_const:cn { c__tl_upper_ #1 _X_ ##1 _ tl } { }
}
}
}
@@ -53,10 +53,217 @@
\tl_const:Nn \c__tl_dotted_I_tl { i }
\tex_endinput:D
}
+\tl_const:cn { c__tl_upper_0_X_0_tl } { dDьЬոՈὀὈᾤ{ὬΙ}ⳬⳫ𐐨𐐀𑣜𑢼 }
+\tl_const:cn { c__tl_upper_0_X_1_tl } { eEĭĬǵǴəƏϩϨэЭұҰԕԔչՉḕḔṹṸờỜὁὉᾥ{ὭΙ}ⲉⲈꙩꙨ𐐩𐐁𑣝𑢽 }
+\tl_const:cn { c__tl_upper_0_X_2_tl } { fFƒƑюЮպՊὂὊᾦ{ὮΙ}ⳮⳭ𐐪𐐂𑣞𑢾 }
+\tl_const:cn { c__tl_upper_0_X_3_tl } { gGįĮɛƐϫϪяЯҳҲԗԖջՋḗḖṻṺởỞὃὋᾧ{ὯΙ}ⲋⲊꙫꙪꜳꜲꞗꞖ𐐫𐐃𑣟𑢿 }
+\tl_const:cn { c__tl_upper_0_X_4_tl } { hHɜꞫѐЀռՌὄὌ𐐬𐐄 }
+\tl_const:cn { c__tl_upper_0_X_5_tl } { iIıIƕǶǹǸϭϬёЁҵҴԙԘսՍḙḘṽṼỡỠὅὍⲍⲌꙭꙬꜵꜴꞙꞘ𐐭𐐅 }
+\tl_const:cn { c__tl_upper_0_X_6_tl } { jJђЂվՎ𐐮𐐆 }
+\tl_const:cn { c__tl_upper_0_X_7_tl } { kK{ij}{IJ}ǻǺϯϮѓЃҷҶԛԚտՏḛḚṿṾợỢⲏⲎⳳⳲꜷꜶꞛꞚ𐐯𐐇 }
+\tl_const:cn { c__tl_upper_0_X_8_tl } { lLɠƓϰΚєЄրՐ𐐰𐐈 }
+\tl_const:cn { c__tl_upper_0_X_9_tl } { mMĵĴƙƘǽǼɡꞬϱΡѕЅҹҸԝԜցՑḝḜẁẀụỤⲑⲐꜹꜸꞝꞜ𐐱𐐉 }
+\tl_const:cn { c__tl_upper_1_X_0_tl } { nNƚȽϲϹіІւՒ𐐲𐐊 }
+\tl_const:cn { c__tl_upper_1_X_1_tl } { oOķĶǿǾɣƔϳͿїЇһҺԟԞփՓḟḞẃẂủỦⲓⲒꜻꜺꞟꞞ𐐳𐐋 }
+\tl_const:cn { c__tl_upper_1_X_2_tl } { pPјЈքՔᾰᾸⰰⰀ𐐴𐐌 }
+\tl_const:cn { c__tl_upper_1_X_3_tl } { qQȁȀɥꞍϵΕљЉҽҼԡԠօՕḡḠẅẄứỨᾱᾹⰱⰁⲕⲔꜽꜼꞡꞠ𐐵𐐍 }
+\tl_const:cn { c__tl_upper_1_X_4_tl } { rRĺĹƞȠɦꞪњЊֆՖⰲⰂ𐐶𐐎 }
+\tl_const:cn { c__tl_upper_1_X_5_tl } { sSȃȂћЋҿҾԣԢḣḢẇẆừỪᾳ{ΑΙ}ⰳⰃⲗⲖꜿꜾꞣꞢ𐐷𐐏 }
+\tl_const:cn { c__tl_upper_1_X_6_tl } { tTļĻɨƗϸϷќЌⰴⰄ𐐸𐐐 }
+\tl_const:cn { c__tl_upper_1_X_7_tl } { uUơƠȅȄɩƖѝЍԥԤḥḤẉẈửỬὑὙⰵⰅⲙⲘꝁꝀꞥꞤ𐐹𐐑 }
+\tl_const:cn { c__tl_upper_1_X_8_tl } { vVľĽўЎӂӁⰶⰆ𐐺𐐒 }
+\tl_const:cn { c__tl_upper_1_X_9_tl } { wWƣƢȇȆɫⱢϻϺџЏԧԦḧḦẋẊữỮὓὛⰷⰇⲛⲚꝃꝂꞧꞦ𐐻𐐓 }
+\tl_const:cn { c__tl_upper_2_X_0_tl } { xX{ŀ}{Ŀ}ɬꞭӄӃⰸⰈⴀႠ𐐼𐐔 }
+\tl_const:cn { c__tl_upper_2_X_1_tl } { yYƥƤȉȈѡѠԩԨḩḨẍẌựỰὕὝⰹⰉⲝⲜⴁႡꝅꝄꞩꞨ𐐽𐐕 }
+\tl_const:cn { c__tl_upper_2_X_2_tl } { zZłŁӆӅⰺⰊⴂႢ𐐾𐐖 }
+\tl_const:cn { c__tl_upper_2_X_3_tl } { ȋȊɯƜѣѢԫԪḫḪẏẎỳỲὗὟⰻⰋⲟⲞⴃႣꝇꝆ𐐿𐐗 }
+\tl_const:cn { c__tl_upper_2_X_4_tl } { àÀńŃƨƧӈӇⓐⒶⰼⰌⴄႤ𐑀𐐘 }
+\tl_const:cn { c__tl_upper_2_X_5_tl } { áÁȍȌɱⱮѥѤԭԬḭḬẑẐỵỴⓑⒷⰽⰍⲡⲠⴅႥꚁꚀꝉꝈ𐑁𐐙 }
+\tl_const:cn { c__tl_upper_2_X_6_tl } { âÂņŅɲƝӊӉιΙⅎℲⓒⒸⰾⰎⴆႦ𐑂𐐚 }
+\tl_const:cn { c__tl_upper_2_X_7_tl } { ãÃȏȎѧѦԯԮḯḮẓẒỷỶⓓⒹⰿⰏⲣⲢⴇႧꚃꚂꝋꝊ𐑃𐐛 }
+\tl_const:cn { c__tl_upper_2_X_8_tl } { äÄňŇӌӋⓔⒺⱀⰐⴈႨ𐑄𐐜 }
+\tl_const:cn { c__tl_upper_2_X_9_tl } { åÅƭƬȑȐɵƟѩѨḱḰẕẔỹỸⓕⒻⱁⰑⲥⲤⴉႩꚅꚄꝍꝌ𐑅𐐝 }
+\tl_const:cn { c__tl_upper_3_X_0_tl } { æÆӎӍⓖⒼⱂⰒⴊႪ𐑆𐐞 }
+\tl_const:cn { c__tl_upper_3_X_1_tl } { çÇŋŊȓȒѫѪӏӀḳḲỻỺῃ{ΗΙ}ⓗⒽⱃⰓⲧⲦⴋႫꚇꚆꝏꝎ𐑇𐐟 }
+\tl_const:cn { c__tl_upper_3_X_2_tl } { èÈưƯὠὨⓘⒾⱄⰔⴌႬ𐑈𐐠 }
+\tl_const:cn { c__tl_upper_3_X_3_tl } { éÉōŌȕȔѭѬӑӐḵḴỽỼὡὩⓙⒿⱅⰕⲩⲨⴍႭꚉꚈꝑꝐ𐑉𐐡 }
+\tl_const:cn { c__tl_upper_3_X_4_tl } { êÊὢὪⓚⓀⱆⰖⴎႮ𐑊𐐢 }
+\tl_const:cn { c__tl_upper_3_X_5_tl } { ëËŏŎȗȖѯѮӓӒḷḶẛṠỿỾὣὫⓛⓁⱇⰗⲫⲪⴏႯꚋꚊꝓꝒ𐑋𐐣 }
+\tl_const:cn { c__tl_upper_3_X_6_tl } { ìÌƴƳἀἈὤὬⓜⓂⱈⰘⴐႰ𐑌𐐤 }
+\tl_const:cn { c__tl_upper_3_X_7_tl } { íÍőŐșȘɽⱤͅΙѱѰӕӔḹḸἁἉὥὭⓝⓃⱉⰙⲭⲬⴑႱꚍꚌꝕꝔ𐑍𐐥 }
+\tl_const:cn { c__tl_upper_3_X_8_tl } { îÎƶƵἂἊὦὮⓞⓄⱊⰚⴒႲ𐑎𐐦 }
+\tl_const:cn { c__tl_upper_3_X_9_tl } { ïÏœŒțȚѳѲӗӖḻḺἃἋὧὯⓟⓅⱋⰛⲯⲮⴓႳꚏꚎꝗꝖ𐑏𐐧 }
+\tl_const:cn { c__tl_upper_4_X_0_tl } { ðÐʀƦάΆἄἌⓠⓆⱌⰜⴔႴ }
+\tl_const:cn { c__tl_upper_4_X_1_tl } { ñÑŕŔƹƸȝȜέΈѵѴәӘḽḼạẠἅἍⓡⓇⱍⰝⲱⲰⴕႵꚑꚐꝙꝘ }
+\tl_const:cn { c__tl_upper_4_X_2_tl } { òÒήΉἆἎⓢⓈⱎⰞⴖႶ }
+\tl_const:cn { c__tl_upper_4_X_3_tl } { óÓŗŖȟȞʃƩίΊѷѶӛӚḿḾảẢἇἏⓣⓉⱏⰟⲳⲲⴗႷꚓꚒꝛꝚ }
+\tl_const:cn { c__tl_upper_4_X_4_tl } { ôÔῐῘⓤⓊⱐⰠⴘႸ }
+\tl_const:cn { c__tl_upper_4_X_5_tl } { õÕřŘƽƼαΑѹѸӝӜᵹꝽṁṀấẤῑῙⓥⓋⱑⰡⲵⲴⴙႹꚕꚔꝝꝜaA }
+\tl_const:cn { c__tl_upper_4_X_6_tl } { öÖβΒⓦⓌⱒⰢⴚႺbB }
+\tl_const:cn { c__tl_upper_4_X_7_tl } { śŚƿǷȣȢʇꞱγΓѻѺӟӞṃṂầẦⓧⓍⱓⰣⲷⲶⴛႻꚗꚖꝟꝞcC }
+\tl_const:cn { c__tl_upper_4_X_8_tl } { øØʈƮδΔὰᾺⓨⓎⱔⰤⴜႼdD }
+\tl_const:cn { c__tl_upper_4_X_9_tl } { ùÙŝŜȥȤʉɄεΕѽѼӡӠᵽⱣṅṄẩẨάΆⓩⓏⱕⰥⲹⲸⴝႽꚙꚘꝡꝠeE }
+\tl_const:cn { c__tl_upper_5_X_0_tl } { úÚʊƱζΖὲῈⱖⰦⴞႾfF }
+\tl_const:cn { c__tl_upper_5_X_1_tl } { ûÛşŞȧȦʋƲηΗѿѾӣӢṇṆẫẪέΈⱗⰧⲻⲺⴟႿꚛꚚꝣꝢgG }
+\tl_const:cn { c__tl_upper_5_X_2_tl } { üÜʌɅθΘἐἘὴῊⱘⰨⴠჀhH }
+\tl_const:cn { c__tl_upper_5_X_3_tl } { ýÝšŠ{Dž}{DŽ}ȩȨιΙҁҀӥӤṉṈậẬἑἙήΉⱙⰩⲽⲼⴡჁꝥꝤiI }
+\tl_const:cn { c__tl_upper_5_X_4_tl } { þÞ{dž}{DŽ}κΚἒἚὶῚⱚⰪⴢჂjJ }
+\tl_const:cn { c__tl_upper_5_X_5_tl } { ÿŸţŢȫȪλΛӧӦṋṊắẮἓἛίΊⱛⰫⲿⲾⴣჃꝧꝦkK }
+\tl_const:cn { c__tl_upper_5_X_6_tl } { {Lj}{LJ}μΜἔἜὸῸⱜⰬⴤჄlL }
+\tl_const:cn { c__tl_upper_5_X_7_tl } { āĀťŤ{lj}{LJ}ȭȬνΝөӨṍṌằẰἕἝόΌⱝⰭⳁⳀⴥჅꝩꝨmM }
+\tl_const:cn { c__tl_upper_5_X_8_tl } { ʒƷξΞὺῪⱞⰮnN }
+\tl_const:cn { c__tl_upper_5_X_9_tl } { ăĂŧŦ{Nj}{NJ}ȯȮοΟӫӪṏṎẳẲύΎⳃⳂⴧჇꝫꝪoO }
+\tl_const:cn { c__tl_upper_6_X_0_tl } { {nj}{NJ}πΠὼῺῠῨⅰⅠpP }
+\tl_const:cn { c__tl_upper_6_X_1_tl } { ąĄũŨȱȰρΡӭӬṑṐẵẴώΏῡῩ{ⅱ}{Ⅱ}ⱡⱠⳅⳄꙁꙀꝭꝬqQ }
+\tl_const:cn { c__tl_upper_6_X_2_tl } { ǎǍςΣ{ⅲ}{Ⅲ}rR }
+\tl_const:cn { c__tl_upper_6_X_3_tl } { ćĆūŪȳȲσΣҋҊӯӮṓṒặẶ{ⅳ}{Ⅳ}ⳇⳆꙃꙂꝯꝮsS }
+\tl_const:cn { c__tl_upper_6_X_4_tl } { ǐǏτΤᾀ{ἈΙ}ⅴⅤtT }
+\tl_const:cn { c__tl_upper_6_X_5_tl } { ĉĈŭŬυΥҍҌӱӰṕṔẹẸᾁ{ἉΙ}ῥῬ{ⅵ}{Ⅵ}ⱥȺⳉⳈⴭჍꙅꙄuU }
+\tl_const:cn { c__tl_upper_6_X_6_tl } { ǒǑφΦᾂ{ἊΙ}{ⅶ}{Ⅶ}ⱦȾvV }
+\tl_const:cn { c__tl_upper_6_X_7_tl } { ċĊůŮχΧҏҎӳӲṗṖẻẺᾃ{ἋΙ}{ⅷ}{Ⅷ}ⳋⳊꙇꙆwW }
+\tl_const:cn { c__tl_upper_6_X_8_tl } { ǔǓψΨἠἨᾄ{ἌΙ}{ⅸ}{Ⅸ}ⱨⱧxX }
+\tl_const:cn { c__tl_upper_6_X_9_tl } { čČűŰωΩґҐӵӴṙṘẽẼἡἩᾅ{ἍΙ}ⅹⅩⳍⳌꙉꙈyY }
+\tl_const:cn { c__tl_upper_7_X_0_tl } { ǖǕʞꞰϊΪἢἪᾆ{ἎΙ}{ⅺ}{Ⅺ}ⱪⱩzZ }
+\tl_const:cn { c__tl_upper_7_X_1_tl } { ďĎųŲϋΫғҒӷӶṛṚếẾἣἫᾇ{ἏΙ}{ⅻ}{Ⅻ}ⳏⳎꙋꙊ }
+\tl_const:cn { c__tl_upper_7_X_2_tl } { ǘǗȼȻόΌаАἤἬⅼⅬⱬⱫ𑣀𑢠 }
+\tl_const:cn { c__tl_upper_7_X_3_tl } { đĐŵŴύΎбБҕҔӹӸṝṜềỀἥἭⅽⅭⳑⳐꙍꙌ𑣁𑢡 }
+\tl_const:cn { c__tl_upper_7_X_4_tl } { ǚǙώΏвВἦἮⅾⅮꝺꝹ𑣂𑢢 }
+\tl_const:cn { c__tl_upper_7_X_5_tl } { ēĒŷŶȿⱾгГҗҖӻӺṟṞểỂἧἯⅿⅯⳓⳒꙏꙎ𑣃𑢣 }
+\tl_const:cn { c__tl_upper_7_X_6_tl } { ǜǛɀⱿϐΒдДꝼꝻ𑣄𑢤 }
+\tl_const:cn { c__tl_upper_7_X_7_tl } { ĕĔǝƎϑΘеЕҙҘӽӼաԱṡṠễỄⳕⳔꙑꙐ𑣅𑢥 }
+\tl_const:cn { c__tl_upper_7_X_8_tl } { źŹɂɁжЖբԲ𑣆𑢦 }
+\tl_const:cn { c__tl_upper_7_X_9_tl } { ėĖǟǞзЗқҚӿӾգԳṣṢệỆῳ{ΩΙ}ⱳⱲⳗⳖꙓꙒꝿꝾ𑣇𑢧 }
+\tl_const:cn { c__tl_upper_8_X_0_tl } { żŻиИդԴᾐ{ἨΙ}ↄↃ𑣈𑢨 }
+\tl_const:cn { c__tl_upper_8_X_1_tl } { µΜęĘǡǠͱͰϕΦйЙҝҜԁԀեԵḁḀṥṤỉỈᾑ{ἩΙ}ⳙⳘꙕꙔꞁꞀ𑣉𑢩 }
+\tl_const:cn { c__tl_upper_8_X_2_tl } { žŽϖΠкКզԶᾒ{ἪΙ}ⱶⱵ𑣊𑢪 }
+\tl_const:cn { c__tl_upper_8_X_3_tl } { ěĚſSǣǢɇɆͳͲϗϏлЛҟҞԃԂէԷḃḂṧṦịỊᾓ{ἫΙ}ⳛⳚꙗꙖꞃꞂ𑣋𑢫 }
+\tl_const:cn { c__tl_upper_8_X_4_tl } { ƀɃмМըԸἰἸᾔ{ἬΙ}𑣌𑢬 }
+\tl_const:cn { c__tl_upper_8_X_5_tl } { ĝĜǥǤɉɈϙϘнНҡҠԅԄթԹḅḄṩṨọỌἱἹᾕ{ἭΙ}ⳝⳜꙙꙘꞅꞄ𑣍𑢭 }
+\tl_const:cn { c__tl_upper_8_X_6_tl } { оОժԺἲἺᾖ{ἮΙ}𑣎𑢮 }
+\tl_const:cn { c__tl_upper_8_X_7_tl } { ğĞƃƂǧǦɋɊͷͶϛϚпПңҢԇԆիԻḇḆṫṪỏỎἳἻᾗ{ἯΙ}ⳟⳞꙛꙚꜣꜢꞇꞆ𑣏𑢯 }
+\tl_const:cn { c__tl_upper_8_X_8_tl } { рРլԼἴἼ𑣐𑢰 }
+\tl_const:cn { c__tl_upper_8_X_9_tl } { ġĠƅƄǩǨɍɌϝϜсСҥҤԉԈխԽḉḈṭṬốỐἵἽⳡⳠꙝꙜꜥꜤ𑣑𑢱 }
+\tl_const:cn { c__tl_upper_9_X_0_tl } { тТծԾἶἾ𑣒𑢲 }
+\tl_const:cn { c__tl_upper_9_X_1_tl } { ģĢǫǪɏɎͻϽϟϞуУҧҦԋԊկԿḋḊṯṮồỒἷἿⳣⳢꙟꙞꜧꜦ𑣓𑢳 }
+\tl_const:cn { c__tl_upper_9_X_2_tl } { ƈƇɐⱯͼϾфФհՀꞌꞋ𑣔𑢴 }
+\tl_const:cn { c__tl_upper_9_X_3_tl } { ĥĤǭǬɑⱭͽϿϡϠхХҩҨԍԌձՁḍḌṱṰổỔⲁⲀꙡꙠꜩꜨ𑣕𑢵 }
+\tl_const:cn { c__tl_upper_9_X_4_tl } { ɒⱰцЦղՂ𑣖𑢶 }
+\tl_const:cn { c__tl_upper_9_X_5_tl } { ħĦǯǮɓƁϣϢчЧҫҪԏԎճՃḏḎṳṲỗỖⲃⲂꙣꙢꜫꜪ𑣗𑢷 }
+\tl_const:cn { c__tl_upper_9_X_6_tl } { ƌƋɔƆшШմՄᾠ{ὨΙ}𑣘𑢸 }
+\tl_const:cn { c__tl_upper_9_X_7_tl } { aAĩĨϥϤщЩҭҬԑԐյՅḑḐṵṴộỘᾡ{ὩΙ}ⲅⲄꙥꙤꜭꜬꞑꞐ𑣙𑢹 }
+\tl_const:cn { c__tl_upper_9_X_8_tl } { bB{Dz}{DZ}ɖƉъЪնՆᾢ{ὪΙ}𑣚𑢺 }
+\tl_const:cn { c__tl_upper_9_X_9_tl } { cCīĪ{dz}{DZ}ɗƊϧϦыЫүҮԓԒշՇḓḒṷṶớỚᾣ{ὫΙ}ⲇⲆꙧꙦꜯꜮꞓꞒ𑣛𑢻 }
+\tl_const:cn { c__tl_lower_0_X_0_tl } { ÈèĬĭƐɛǴǵϨϩҰұԔԕḔḕṸṹỜờⒸⓒⰤⱔⲈⲉꙨꙩ }
+\tl_const:cn { c__tl_lower_0_X_1_tl } { ÉéƑƒჍⴭⒹⓓⰥⱕⳭⳮ }
+\tl_const:cn { c__tl_lower_0_X_2_tl } { ÊêĮįǶƕΆάϪϫҲҳԖԗḖḗṺṻỞởⒺⓔⰦⱖⲊⲋꙪꙫꜲꜳꞖꞗ }
+\tl_const:cn { c__tl_lower_0_X_3_tl } { ËëƓɠǷƿⒻⓕⰧⱗ }
+\tl_const:cn { c__tl_lower_0_X_4_tl } { Ììİ{i̇}ƔɣǸǹΈέϬϭҴҵԘԙḘḙṼṽỠỡᾨᾠⒼⓖⰨⱘⲌⲍꙬꙭꜴꜵꞘꞙ }
+\tl_const:cn { c__tl_lower_0_X_5_tl } { ÍíΉήᾩᾡⒽⓗⰩⱙ }
+\tl_const:cn { c__tl_lower_0_X_6_tl } { Îî{IJ}{ij}ƖɩǺǻΊίϮϯҶҷԚԛḚḛṾṿỢợᾪᾢⒾⓘⰪⱚⲎⲏⳲⳳꜶꜷꞚꞛ }
+\tl_const:cn { c__tl_lower_0_X_7_tl } { ÏïƗɨᾫᾣⒿⓙⰫⱛ }
+\tl_const:cn { c__tl_lower_0_X_8_tl } { ÐðĴĵƘƙǼǽΌόҸҹԜԝḜḝẀẁỤụὈὀᾬᾤⓀⓚⰬⱜⲐⲑꜸꜹꞜꞝ }
+\tl_const:cn { c__tl_lower_0_X_9_tl } { ÑñὉὁᾭᾥⓁⓛⰭⱝ }
+\tl_const:cn { c__tl_lower_1_X_0_tl } { ÒòĶķǾǿΎύҺһԞԟḞḟẂẃỦủὊὂᾮᾦⓂⓜⰮⱞⲒⲓꜺꜻꞞꞟ }
+\tl_const:cn { c__tl_lower_1_X_1_tl } { ÓóΏώὋὃᾯᾧⓃⓝ }
+\tl_const:cn { c__tl_lower_1_X_2_tl } { ÔôƜɯȀȁϴθҼҽԠԡḠḡẄẅỨứὌὄⓄⓞⲔⲕꜼꜽꞠꞡ }
+\tl_const:cn { c__tl_lower_1_X_3_tl } { ÕõĹĺƝɲΑαὍὅⓅⓟAa }
+\tl_const:cn { c__tl_lower_1_X_4_tl } { ÖöȂȃΒβҾҿԢԣḢḣẆẇỪừⓆⓠⲖⲗꜾꜿꞢꞣBb }
+\tl_const:cn { c__tl_lower_1_X_5_tl } { ĻļƟɵΓγϷϸⓇⓡCc }
+\tl_const:cn { c__tl_lower_1_X_6_tl } { ØøƠơȄȅΔδӀӏԤԥḤḥẈẉỬửⓈⓢⲘⲙꝀꝁꞤꞥDd }
+\tl_const:cn { c__tl_lower_1_X_7_tl } { ÙùĽľΕεϹϲӁӂⓉⓣEe }
+\tl_const:cn { c__tl_lower_1_X_8_tl } { ÚúƢƣȆȇΖζϺϻԦԧḦḧẊẋỮữⓊⓤⲚⲛꝂꝃꞦꞧFf }
+\tl_const:cn { c__tl_lower_1_X_9_tl } { Ûû{Ŀ}{ŀ}ΗηӃӄⓋⓥGg }
+\tl_const:cn { c__tl_lower_2_X_0_tl } { ÜüƤƥȈȉΘθѠѡԨԩḨḩẌẍỰựᾸᾰⓌⓦⲜⲝꝄꝅꞨꞩHh }
+\tl_const:cn { c__tl_lower_2_X_1_tl } { ÝýŁłΙιϽͻӅӆᾹᾱⓍⓧIi }
+\tl_const:cn { c__tl_lower_2_X_2_tl } { ÞþƦʀȊȋΚκϾͼѢѣԪԫḪḫẎẏỲỳᾺὰⓎⓨⲞⲟꝆꝇꞪɦJj }
+\tl_const:cn { c__tl_lower_2_X_3_tl } { ŃńƧƨΛλϿͽӇӈΆάⓏⓩꞫɜKk }
+\tl_const:cn { c__tl_lower_2_X_4_tl } { ȌȍΜμЀѐѤѥԬԭḬḭẐẑỴỵᾼᾳⲠⲡꚀꚁꝈꝉꞬɡLl }
+\tl_const:cn { c__tl_lower_2_X_5_tl } { ŅņƩʃΝνЁёӉӊὙὑꞭɬMm }
+\tl_const:cn { c__tl_lower_2_X_6_tl } { ȎȏΞξЂђѦѧԮԯḮḯẒẓỶỷⲢⲣꚂꚃꝊꝋNn }
+\tl_const:cn { c__tl_lower_2_X_7_tl } { ŇňΟοЃѓӋӌὛὓOo }
+\tl_const:cn { c__tl_lower_2_X_8_tl } { ƬƭȐȑΠπЄєѨѩḰḱẔẕỸỹⲤⲥꚄꚅꝌꝍꞰʞPp }
+\tl_const:cn { c__tl_lower_2_X_9_tl } { ΡρЅѕӍӎԱաὝὕꞱʇQq }
+\tl_const:cn { c__tl_lower_3_X_0_tl } { ŊŋƮʈȒȓІіѪѫԲբḲḳỺỻⲦⲧꚆꚇꝎꝏRr }
+\tl_const:cn { c__tl_lower_3_X_1_tl } { ƯưΣσЇїԳգὟὗSs }
+\tl_const:cn { c__tl_lower_3_X_2_tl } { ŌōȔȕΤτЈјѬѭӐӑԴդḴḵỼỽⲨⲩꚈꚉꝐꝑTt }
+\tl_const:cn { c__tl_lower_3_X_3_tl } { ƱʊΥυЉљԵեUu }
+\tl_const:cn { c__tl_lower_3_X_4_tl } { ŎŏƲʋȖȗΦφЊњѮѯӒӓԶզḶḷỾỿⲪⲫꚊꚋꝒꝓVv }
+\tl_const:cn { c__tl_lower_3_X_5_tl } { ƳƴΧχЋћԷէWw }
+\tl_const:cn { c__tl_lower_3_X_6_tl } { ŐőȘșΨψЌќѰѱӔӕԸըḸḹῈὲⲬⲭꚌꚍꝔꝕXx }
+\tl_const:cn { c__tl_lower_3_X_7_tl } { ƵƶΩωЍѝԹթΈέYy }
+\tl_const:cn { c__tl_lower_3_X_8_tl } { ŒœȚțΪϊЎўѲѳӖӗԺժḺḻẞßῊὴⲮⲯꚎꚏꝖꝗZz }
+\tl_const:cn { c__tl_lower_3_X_9_tl } { ƷʒΫϋЏџԻիΉή }
+\tl_const:cn { c__tl_lower_4_X_0_tl } { ŔŕƸƹȜȝАаѴѵӘәԼլḼḽẠạὨὠῌῃⲰⲱꚐꚑꝘꝙ𑢠𑣀 }
+\tl_const:cn { c__tl_lower_4_X_1_tl } { БбԽխὩὡ𑢡𑣁 }
+\tl_const:cn { c__tl_lower_4_X_2_tl } { ŖŗȞȟВвѶѷӚӛԾծḾḿẢảὪὢⲲⲳꚒꚓꝚꝛ𑢢𑣂 }
+\tl_const:cn { c__tl_lower_4_X_3_tl } { ГгԿկὫὣ𑢣𑣃 }
+\tl_const:cn { c__tl_lower_4_X_4_tl } { ŘřƼƽȠƞДдѸѹӜӝՀհṀṁẤấἈἀὬὤⅠⅰⲴⲵꚔꚕꝜꝝ𑢤𑣄 }
+\tl_const:cn { c__tl_lower_4_X_5_tl } { ЕеՁձἉἁὭὥ{Ⅱ}{ⅱ}𑢥𑣅 }
+\tl_const:cn { c__tl_lower_4_X_6_tl } { ŚśȢȣЖжѺѻӞӟՂղṂṃẦầἊἂὮὦ{Ⅲ}{ⅲ}ⲶⲷꚖꚗꝞꝟ𑢦𑣆 }
+\tl_const:cn { c__tl_lower_4_X_7_tl } { ЗзՃճἋἃὯὧ{Ⅳ}{ⅳ}𑢧𑣇 }
+\tl_const:cn { c__tl_lower_4_X_8_tl } { ŜŝȤȥИиѼѽӠӡՄմṄṅẨẩἌἄⅤⅴⲸⲹꚘꚙꝠꝡ𑢨𑣈 }
+\tl_const:cn { c__tl_lower_4_X_9_tl } { ЙйՅյἍἅ{Ⅵ}{ⅵ}𑢩𑣉 }
+\tl_const:cn { c__tl_lower_5_X_0_tl } { ŞşȦȧКкѾѿӢӣՆնṆṇẪẫἎἆ{Ⅶ}{ⅶ}ⲺⲻꚚꚛꝢꝣ𑢪𑣊 }
+\tl_const:cn { c__tl_lower_5_X_1_tl } { ЛлՇշἏἇ{Ⅷ}{ⅷ}𑢫𑣋 }
+\tl_const:cn { c__tl_lower_5_X_2_tl } { Šš{DŽ}{dž}ȨȩМмҀҁӤӥՈոṈṉẬậῘῐ{Ⅸ}{ⅸ}ⲼⲽꝤꝥ𑢬𑣌 }
+\tl_const:cn { c__tl_lower_5_X_3_tl } { {Dž}{dž}НнՉչῙῑⅩⅹ𑢭𑣍 }
+\tl_const:cn { c__tl_lower_5_X_4_tl } { ŢţȪȫОоӦӧՊպṊṋẮắῚὶ{Ⅺ}{ⅺ}ⲾⲿꝦꝧ𑢮𑣎 }
+\tl_const:cn { c__tl_lower_5_X_5_tl } { {LJ}{lj}ПпՋջΊί{Ⅻ}{ⅻ}𑢯𑣏 }
+\tl_const:cn { c__tl_lower_5_X_6_tl } { ĀāŤť{Lj}{lj}ȬȭРрӨөՌռႠⴀṌṍẰằⅬⅼⳀⳁꝨꝩ𑢰𑣐 }
+\tl_const:cn { c__tl_lower_5_X_7_tl } { СсՍսႡⴁⅭⅽ𑢱𑣑 }
+\tl_const:cn { c__tl_lower_5_X_8_tl } { ĂăŦŧ{NJ}{nj}ȮȯТтӪӫՎվႢⴂṎṏẲẳⅮⅾⳂⳃꝪꝫ𑢲𑣒 }
+\tl_const:cn { c__tl_lower_5_X_9_tl } { {Nj}{nj}УуՏտႣⴃⅯⅿ𑢳𑣓 }
+\tl_const:cn { c__tl_lower_6_X_0_tl } { ĄąŨũȰȱФфӬӭՐրႤⴄṐṑẴẵἘἐⱠⱡⳄⳅꙀꙁꝬꝭ𐐀𐐨𑢴𑣔 }
+\tl_const:cn { c__tl_lower_6_X_1_tl } { ǍǎХхՑցႥⴅἙἑ𐐁𐐩𑢵𑣕 }
+\tl_const:cn { c__tl_lower_6_X_2_tl } { ĆćŪūȲȳЦцҊҋӮӯՒւႦⴆṒṓẶặἚἒⱢɫⳆⳇꙂꙃꝮꝯ𐐂𐐪𑢶𑣖 }
+\tl_const:cn { c__tl_lower_6_X_3_tl } { ǏǐЧчՓփႧⴇἛἓⱣᵽ𐐃𐐫𑢷𑣗 }
+\tl_const:cn { c__tl_lower_6_X_4_tl } { ĈĉŬŭШшҌҍӰӱՔքႨⴈṔṕẸẹἜἔⰀⰰⱤɽⳈⳉꙄꙅ𐐄𐐬𑢸𑣘 }
+\tl_const:cn { c__tl_lower_6_X_5_tl } { AaǑǒЩщՕօႩⴉἝἕⰁⰱ𐐅𐐭𑢹𑣙 }
+\tl_const:cn { c__tl_lower_6_X_6_tl } { BbĊċŮůЪъҎҏӲӳՖֆႪⴊṖṗẺẻⰂⰲⳊⳋꙆꙇ𐐆𐐮𑢺𑣚 }
+\tl_const:cn { c__tl_lower_6_X_7_tl } { CcǓǔЫыႫⴋⰃⰳⱧⱨ𐐇𐐯𑢻𑣛 }
+\tl_const:cn { c__tl_lower_6_X_8_tl } { DdČčŰűЬьҐґӴӵႬⴌṘṙẼẽῨῠⰄⰴⳌⳍꙈꙉ𐐈𐐰𑢼𑣜 }
+\tl_const:cn { c__tl_lower_6_X_9_tl } { EeǕǖЭэႭⴍῩῡⰅⰵⱩⱪ𐐉𐐱𑢽𑣝 }
+\tl_const:cn { c__tl_lower_7_X_0_tl } { FfĎďŲųȺⱥЮюҒғӶӷႮⴎṚṛẾếῪὺⰆⰶⳎⳏꙊꙋ𐐊𐐲𑢾𑣞 }
+\tl_const:cn { c__tl_lower_7_X_1_tl } { GgǗǘȻȼЯяႯⴏΎύⰇⰷⱫⱬ𐐋𐐳𑢿𑣟 }
+\tl_const:cn { c__tl_lower_7_X_2_tl } { HhĐđŴŵҔҕӸӹႰⴐṜṝỀềᾈᾀῬῥⰈⰸⳐⳑꙌꙍ𐐌𐐴 }
+\tl_const:cn { c__tl_lower_7_X_3_tl } { IiǙǚȽƚႱⴑᾉᾁⰉⰹⱭɑꝹꝺ𐐍𐐵 }
+\tl_const:cn { c__tl_lower_7_X_4_tl } { JjĒēŶŷȾⱦҖҗӺӻႲⴒṞṟỂểᾊᾂⰊⰺⱮɱⳒⳓꙎꙏ𐐎𐐶 }
+\tl_const:cn { c__tl_lower_7_X_5_tl } { KkǛǜϏϗႳⴓᾋᾃⰋⰻⱯɐꝻꝼ𐐏𐐷 }
+\tl_const:cn { c__tl_lower_7_X_6_tl } { LlĔĕŸÿҘҙӼӽႴⴔṠṡỄễἨἠᾌᾄⰌⰼⱰɒⳔⳕꙐꙑ𐐐𐐸 }
+\tl_const:cn { c__tl_lower_7_X_7_tl } { MmŹźɁɂႵⴕἩἡᾍᾅⰍⰽꝽᵹ𐐑𐐹 }
+\tl_const:cn { c__tl_lower_7_X_8_tl } { NnĖėǞǟҚқӾӿႶⴖṢṣỆệἪἢᾎᾆⰎⰾⱲⱳⳖⳗꙒꙓꝾꝿ𐐒𐐺 }
+\tl_const:cn { c__tl_lower_7_X_9_tl } { OoŻżɃƀႷⴗἫἣᾏᾇↃↄⰏⰿ𐐓𐐻 }
+\tl_const:cn { c__tl_lower_8_X_0_tl } { PpĘęǠǡɄʉͰͱҜҝԀԁႸⴘḀḁṤṥỈỉἬἤⰐⱀⳘⳙꙔꙕꞀꞁ𐐔𐐼 }
+\tl_const:cn { c__tl_lower_8_X_1_tl } { QqŽžɅʌႹⴙἭἥⰑⱁⱵⱶ𐐕𐐽 }
+\tl_const:cn { c__tl_lower_8_X_2_tl } { RrĚěǢǣɆɇͲͳҞҟԂԃႺⴚḂḃṦṧỊịἮἦⰒⱂⳚⳛꙖꙗꞂꞃ𐐖𐐾 }
+\tl_const:cn { c__tl_lower_8_X_3_tl } { SsႻⴛἯἧⰓⱃ𐐗𐐿 }
+\tl_const:cn { c__tl_lower_8_X_4_tl } { TtĜĝǤǥɈɉϘϙҠҡԄԅႼⴜḄḅṨṩỌọῸὸⰔⱄⳜⳝꙘꙙꞄꞅ𐐘𐑀 }
+\tl_const:cn { c__tl_lower_8_X_5_tl } { UuƁɓႽⴝΌόⰕⱅ𐐙𐑁 }
+\tl_const:cn { c__tl_lower_8_X_6_tl } { VvĞğƂƃǦǧɊɋͶͷϚϛҢңԆԇႾⴞḆḇṪṫỎỏῺὼΩωⰖⱆⳞⳟꙚꙛꜢꜣꞆꞇ𐐚𐑂 }
+\tl_const:cn { c__tl_lower_8_X_7_tl } { WwႿⴟΏώⰗⱇ𐐛𐑃 }
+\tl_const:cn { c__tl_lower_8_X_8_tl } { XxĠġƄƅǨǩɌɍϜϝҤҥԈԉჀⴠḈḉṬṭỐốᾘᾐῼῳⰘⱈⳠⳡꙜꙝꜤꜥ𐐜𐑄 }
+\tl_const:cn { c__tl_lower_8_X_9_tl } { YyჁⴡᾙᾑⰙⱉ𐐝𐑅 }
+\tl_const:cn { c__tl_lower_9_X_0_tl } { ZzĢģƆɔǪǫɎɏϞϟҦҧԊԋჂⴢḊḋṮṯỒồᾚᾒKkⰚⱊⱾȿⳢⳣꙞꙟꜦꜧ𐐞𐑆 }
+\tl_const:cn { c__tl_lower_9_X_1_tl } { ƇƈჃⴣᾛᾓÅåⰛⱋⱿɀꞋꞌ𐐟𐑇 }
+\tl_const:cn { c__tl_lower_9_X_2_tl } { ÀàĤĥǬǭϠϡҨҩԌԍჄⴤḌḍṰṱỔổἸἰᾜᾔⰜⱌⲀⲁꙠꙡꜨꜩ𐐠𐑈 }
+\tl_const:cn { c__tl_lower_9_X_3_tl } { ÁáƉɖჅⴥἹἱᾝᾕⰝⱍꞍɥ𐐡𐑉 }
+\tl_const:cn { c__tl_lower_9_X_4_tl } { ÂâĦħƊɗǮǯϢϣҪҫԎԏḎḏṲṳỖỗἺἲᾞᾖⰞⱎⲂⲃꙢꙣꜪꜫ𐐢𐑊 }
+\tl_const:cn { c__tl_lower_9_X_5_tl } { ÃãƋƌͿϳჇⴧἻἳᾟᾗⰟⱏ𐐣𐑋 }
+\tl_const:cn { c__tl_lower_9_X_6_tl } { ÄäĨĩϤϥҬҭԐԑḐḑṴṵỘộἼἴⰠⱐⲄⲅꙤꙥꜬꜭꞐꞑ𐐤𐑌 }
+\tl_const:cn { c__tl_lower_9_X_7_tl } { Åå{DZ}{dz}ἽἵⰡⱑ𐐥𐑍 }
+\tl_const:cn { c__tl_lower_9_X_8_tl } { ÆæĪīƎǝ{Dz}{dz}ϦϧҮүԒԓḒḓṶṷỚớἾἶℲⅎⒶⓐⰢⱒⲆⲇꙦꙧꜮꜯꞒꞓ𐐦𐑎 }
+\tl_const:cn { c__tl_lower_9_X_9_tl } { ÇçƏəἿἷⒷⓑⰣⱓⳫⳬ𐐧𐑏 }
+\tl_const:Nn \c__tl_mixed_exceptions_tl { {ß}{Ss}{ff}{Ff}{fi}{Fi}{fl}{Fl}{ffi}{Ffi}{ffl}{Ffl}{ſt}{St}{st}{St}{և}{Եւ}{ﬓ}{Մն}{ﬔ}{Մե}{ﬕ}{Մի}{ﬖ}{Վն}{ﬗ}{Մխ}{ᾲ}{Ὰͅ}{ᾴ}{Άͅ}{ῂ}{Ὴͅ}{ῄ}{Ήͅ}{ῲ}{Ὼͅ}{ῴ}{Ώͅ}{ᾷ}{ᾼ͂}{ῇ}{ῌ͂}{ῷ}{ῼ͂}DžDždžDžLjLjljLjNjNjnjNjDzDzdzDz }
+\tl_const:Nn \c__tl_std_sigma_tl {σ}
+\tl_const:Nn \c__tl_final_sigma_tl {ς}
+\tl_const:Nn \c__tl_dotless_i_tl {ı}
+\tl_const:Nn \c__tl_dot_above_tl {̇}
+\tl_const:Nn \c__tl_dotted_I_tl {İ}
+\tl_const:Nn \c__tl_accents_lt_tl {Ì{i̇̀}Í{i̇́}Ĩ{i̇̃}}
\group_begin:
\cs_set_protected:Npn \__str_tmp:NNn #1#2#3
{
- \tl_const:cx { c__str_fold_#1_#2_tl }
+ \tl_const:cx { c__str_fold_#1 _X_ #2_tl }
{ \__str_tmp:Nw #3 \q_recursion_tail { } \q_recursion_stop }
}
\cs_set:Npn \__str_tmp:Nw #1#2
@@ -70,84 +277,84 @@
}
\__str_tmp:NNn 0 0 { ÈèĬĭƐɛǴǵϨϩҰұԔԕḔḕṸṹỜờᾤ{ὤι}ⒸⓒⰤⱔⲈⲉꙨꙩ }
\__str_tmp:NNn 0 1 { ÉéƑƒჍⴭᾥ{ὥι}ⒹⓓⰥⱕⳭⳮ }
- \__str_tmp:NNn 0 2 { ÊêĮįǶƕΆάϪϫҲҳԖԗḖḗṺṻỞởᾦ{ὦι}ⒺⓔⰦⱖⲊⲋꙪꙫꜲꜳ }
+ \__str_tmp:NNn 0 2 { ÊêĮįǶƕΆάϪϫҲҳԖԗḖḗṺṻỞởᾦ{ὦι}ⒺⓔⰦⱖⲊⲋꙪꙫꜲꜳꞖꞗ }
\__str_tmp:NNn 0 3 { ËëƓɠǷƿᾧ{ὧι}ⒻⓕⰧⱗ }
- \__str_tmp:NNn 0 4 { Ììİ{i̇}ƔɣǸǹΈέϬϭҴҵԘԙḘḙṼṽỠỡᾨ{ὠι}ⒼⓖⰨⱘⲌⲍꙬꙭꜴꜵ }
+ \__str_tmp:NNn 0 4 { Ììİ{i̇}ƔɣǸǹΈέϬϭҴҵԘԙḘḙṼṽỠỡᾨ{ὠι}ⒼⓖⰨⱘⲌⲍꙬꙭꜴꜵꞘꞙ }
\__str_tmp:NNn 0 5 { ÍíΉήᾩ{ὡι}ⒽⓗⰩⱙ }
- \__str_tmp:NNn 0 6 { ÎîIJijƖɩǺǻΊίϮϯҶҷԚԛḚḛṾṿỢợᾪ{ὢι}ⒾⓘⰪⱚⲎⲏⳲⳳꜶꜷ }
+ \__str_tmp:NNn 0 6 { Îî{IJ}{ij}ƖɩǺǻΊίϮϯҶҷԚԛḚḛṾṿỢợᾪ{ὢι}ⒾⓘⰪⱚⲎⲏⳲⳳꜶꜷꞚꞛ }
\__str_tmp:NNn 0 7 { ÏïƗɨᾫ{ὣι}ⒿⓙⰫⱛ }
- \__str_tmp:NNn 0 8 { ÐðĴĵƘƙǼǽΌόϰκҸҹԜԝḜḝẀẁỤụὈὀᾬ{ὤι}ⓀⓚⰬⱜⲐⲑꜸꜹ }
+ \__str_tmp:NNn 0 8 { ÐðĴĵƘƙǼǽΌόϰκҸҹԜԝḜḝẀẁỤụὈὀᾬ{ὤι}ⓀⓚⰬⱜⲐⲑꜸꜹꞜꞝ }
\__str_tmp:NNn 0 9 { ÑñϱρὉὁᾭ{ὥι}ⓁⓛⰭⱝ }
- \__str_tmp:NNn 1 0 { ÒòĶķǾǿΎύҺһԞԟḞḟẂẃỦủὊὂᾮ{ὦι}ⓂⓜⰮⱞⲒⲓꜺꜻ }
+ \__str_tmp:NNn 1 0 { ÒòĶķǾǿΎύҺһԞԟḞḟẂẃỦủὊὂᾮ{ὦι}ⓂⓜⰮⱞⲒⲓꜺꜻꞞꞟ }
\__str_tmp:NNn 1 1 { ÓóΏώὋὃᾯ{ὧι}Ⓝⓝ }
\__str_tmp:NNn 1 2 { ÔôƜɯȀȁΐ{ΐ}ϴθҼҽԠԡḠḡẄẅỨứὌὄⓄⓞⲔⲕꜼꜽꞠꞡ }
\__str_tmp:NNn 1 3 { ÕõĹĺƝɲΑαϵεὍὅⓅⓟAa }
\__str_tmp:NNn 1 4 { ÖöȂȃΒβҾҿԢԣḢḣẆẇỪừᾲ{ὰι}ⓆⓠⲖⲗꜾꜿꞢꞣBb }
- \__str_tmp:NNn 1 5 { ĻļƟɵΓγϷϸև{եւ}ᾳ{αι}ⓇⓡCc }
+ \__str_tmp:NNn 1 5 { ĻļƟɵΓγϷϸ{և}{եւ}ᾳ{αι}ⓇⓡCc }
\__str_tmp:NNn 1 6 { ØøƠơȄȅΔδӀӏԤԥḤḥẈẉỬửὐ{ὐ}ᾴ{άι}ⓈⓢⲘⲙꝀꝁꞤꞥDd }
\__str_tmp:NNn 1 7 { ÙùĽľΕεϹϲӁӂⓉⓣEe }
\__str_tmp:NNn 1 8 { ÚúƢƣȆȇΖζϺϻԦԧḦḧẊẋỮữὒ{ὒ}ᾶ{ᾶ}ⓊⓤⲚⲛꝂꝃꞦꞧFf }
- \__str_tmp:NNn 1 9 { ÛûĿŀΗηӃӄᾷ{ᾶι}ⓋⓥGg }
- \__str_tmp:NNn 2 0 { ÜüƤƥȈȉΘθѠѡḨḩẌẍỰựὔ{ὔ}ᾸᾰⓌⓦⲜⲝꝄꝅꞨꞩHh }
+ \__str_tmp:NNn 1 9 { Ûû{Ŀ}{ŀ}ΗηӃӄᾷ{ᾶι}ⓋⓥGg }
+ \__str_tmp:NNn 2 0 { ÜüƤƥȈȉΘθѠѡԨԩḨḩẌẍỰựὔ{ὔ}ᾸᾰⓌⓦⲜⲝꝄꝅꞨꞩHh }
\__str_tmp:NNn 2 1 { ÝýŁłΙιϽͻӅӆᾹᾱⓍⓧIi }
- \__str_tmp:NNn 2 2 { ÞþƦʀȊȋΚκϾͼѢѣḪḫẎẏỲỳὖ{ὖ}ᾺὰⓎⓨⲞⲟꝆꝇꞪɦJj }
- \__str_tmp:NNn 2 3 { ß{ss}ŃńƧƨΛλϿͽӇӈΆάⓏⓩKk }
- \__str_tmp:NNn 2 4 { ȌȍΜμЀѐѤѥḬḭẐẑỴỵᾼ{αι}ⲠⲡꚀꚁꝈꝉLl }
- \__str_tmp:NNn 2 5 { ŅņƩʃΝνЁёӉӊὙὑMm }
- \__str_tmp:NNn 2 6 { ȎȏΞξЂђѦѧḮḯẒẓỶỷιιⲢⲣꚂꚃꝊꝋNn }
+ \__str_tmp:NNn 2 2 { ÞþƦʀȊȋΚκϾͼѢѣԪԫḪḫẎẏỲỳὖ{ὖ}ᾺὰⓎⓨⲞⲟꝆꝇꞪɦJj }
+ \__str_tmp:NNn 2 3 { ß{ss}ŃńƧƨΛλϿͽӇӈΆάⓏⓩꞫɜKk }
+ \__str_tmp:NNn 2 4 { ȌȍΜμЀѐѤѥԬԭḬḭẐẑỴỵᾼ{αι}ⲠⲡꚀꚁꝈꝉꞬɡLl }
+ \__str_tmp:NNn 2 5 { ŅņƩʃΝνЁёӉӊὙὑꞭɬMm }
+ \__str_tmp:NNn 2 6 { ȎȏΞξЂђѦѧԮԯḮḯẒẓỶỷιιⲢⲣꚂꚃꝊꝋNn }
\__str_tmp:NNn 2 7 { ŇňΟοЃѓӋӌὛὓOo }
- \__str_tmp:NNn 2 8 { ƬƭȐȑΠπЄєѨѩḰḱẔẕỸỹⲤⲥꚄꚅꝌꝍPp }
- \__str_tmp:NNn 2 9 { ʼn{ʼn}ΡρЅѕӍӎԱաὝὕQq }
+ \__str_tmp:NNn 2 8 { ƬƭȐȑΠπЄєѨѩḰḱẔẕỸỹⲤⲥꚄꚅꝌꝍꞰʞPp }
+ \__str_tmp:NNn 2 9 { {ʼn}{ʼn}ΡρЅѕӍӎԱաὝὕꞱʇQq }
\__str_tmp:NNn 3 0 { ŊŋƮʈȒȓІіѪѫԲբḲḳẖ{ẖ}Ỻỻῂ{ὴι}ⲦⲧꚆꚇꝎꝏRr }
\__str_tmp:NNn 3 1 { ƯưΣσЇїԳգẗ{ẗ}Ὗὗῃ{ηι}Ss }
\__str_tmp:NNn 3 2 { ŌōȔȕΤτЈјѬѭӐӑԴդḴḵẘ{ẘ}Ỽỽῄ{ήι}ⲨⲩꚈꚉꝐꝑTt }
\__str_tmp:NNn 3 3 { ƱʊΥυЉљԵեẙ{ẙ}Uu }
- \__str_tmp:NNn 3 4 { ŎŏƲʋȖȗΦφЊњѮѯӒӓԶզḶḷẚ{aʾ}Ỿỿῆ{ῆ}ⲪⲫꚊꚋꝒꝓVv }
+ \__str_tmp:NNn 3 4 { ŎŏƲʋȖȗΦφЊњѮѯӒӓԶզḶḷ{ẚ}{aʾ}Ỿỿῆ{ῆ}ⲪⲫꚊꚋꝒꝓVv }
\__str_tmp:NNn 3 5 { ƳƴΧχЋћԷէẛṡῇ{ῆι}Ww }
\__str_tmp:NNn 3 6 { ŐőȘșΨψЌќѰѱӔӕԸըḸḹῈὲⲬⲭꚌꚍꝔꝕXx }
\__str_tmp:NNn 3 7 { ƵƶͅιΩωЍѝԹթΈέYy }
\__str_tmp:NNn 3 8 { ŒœȚțΪϊЎўѲѳӖӗԺժḺḻẞ{ss}ῊὴⲮⲯꚎꚏꝖꝗZz }
\__str_tmp:NNn 3 9 { ƷʒΫϋЏџԻիΉή }
- \__str_tmp:NNn 4 0 { ŔŕƸƹȜȝАаѴѵӘәԼլḼḽẠạὨὠῌ{ηι}ⲰⲱꚐꚑꝘꝙ }
- \__str_tmp:NNn 4 1 { БбԽխὩὡ }
- \__str_tmp:NNn 4 2 { ŖŗȞȟВвѶѷӚӛԾծḾḿẢảὪὢⲲⲳꚒꚓꝚꝛ }
- \__str_tmp:NNn 4 3 { ГгԿկὫὣ }
- \__str_tmp:NNn 4 4 { ŘřƼƽȠƞΰ{ΰ}ДдѸѹӜӝՀհṀṁẤấἈἀὬὤⅠⅰⲴⲵꚔꚕꝜꝝ }
- \__str_tmp:NNn 4 5 { ЕеՁձἉἁὭὥⅡⅱ }
- \__str_tmp:NNn 4 6 { ŚśȢȣЖжѺѻӞӟՂղṂṃẦầἊἂὮὦῒ{ῒ}ⅢⅲⲶⲷꚖꚗꝞꝟ }
- \__str_tmp:NNn 4 7 { ЗзՃճἋἃὯὧΐ{ΐ}Ⅳⅳ }
- \__str_tmp:NNn 4 8 { ŜŝȤȥИиѼѽӠӡՄմṄṅẨẩἌἄⅤⅴⲸⲹꝠꝡ }
- \__str_tmp:NNn 4 9 { ЙйՅյἍἅⅥⅵ }
- \__str_tmp:NNn 5 0 { ŞşȦȧКкѾѿӢӣՆնṆṇẪẫἎἆῖ{ῖ}ⅦⅶⲺⲻꝢꝣ }
- \__str_tmp:NNn 5 1 { ЛлՇշἏἇῗ{ῗ}Ⅷⅷ }
- \__str_tmp:NNn 5 2 { ŠšDŽdžȨȩМмҀҁӤӥՈոṈṉẬậῘῐⅨⅸⲼⲽꝤꝥ }
- \__str_tmp:NNn 5 3 { DždžНнՉչῙῑⅩⅹ }
- \__str_tmp:NNn 5 4 { ŢţȪȫОоӦӧՊպṊṋẮắῚὶⅪⅺⲾⲿꝦꝧ }
- \__str_tmp:NNn 5 5 { LJljПпՋջΊίⅫⅻ }
- \__str_tmp:NNn 5 6 { ĀāŤťLjljȬȭРрӨөՌռႠⴀṌṍẰằⅬⅼⳀⳁꝨꝩff{ff} }
- \__str_tmp:NNn 5 7 { СсՍսႡⴁⅭⅽfi{fi} }
- \__str_tmp:NNn 5 8 { ĂăŦŧNJnjȮȯТтӪӫՎվႢⴂṎṏẲẳⅮⅾⳂⳃꝪꝫfl{fl} }
- \__str_tmp:NNn 5 9 { NjnjУуՏտႣⴃⅯⅿffi{ffi} }
- \__str_tmp:NNn 6 0 { ĄąŨũȰȱФфӬӭՐրႤⴄṐṑẴẵἘἐⱠⱡⳄⳅꙀꙁꝬꝭffl{ffl}𐐀𐐨 }
- \__str_tmp:NNn 6 1 { ǍǎХхՑցႥⴅἙἑſt{st}𐐁𐐩 }
- \__str_tmp:NNn 6 2 { ĆćŪūȲȳςσЦцҊҋӮӯՒւႦⴆṒṓẶặἚἒῢ{ῢ}ⱢɫⳆⳇꙂꙃꝮꝯst{st}𐐂𐐪 }
- \__str_tmp:NNn 6 3 { ǏǐЧчՓփႧⴇἛἓΰ{ΰ}Ᵽᵽ𐐃𐐫 }
- \__str_tmp:NNn 6 4 { ĈĉŬŭШшҌҍӰӱՔքႨⴈṔṕẸẹἜἔᾀ{ἀι}ῤ{ῤ}ⰀⰰⱤɽⳈⳉꙄꙅ𐐄𐐬 }
- \__str_tmp:NNn 6 5 { AaǑǒЩщՕօႩⴉἝἕᾁ{ἁι}Ⰱⰱ𐐅𐐭 }
- \__str_tmp:NNn 6 6 { BbĊċŮůЪъҎҏӲӳՖֆႪⴊṖṗẺẻᾂ{ἂι}ῦ{ῦ}ⰂⰲⳊⳋꙆꙇ𐐆𐐮 }
- \__str_tmp:NNn 6 7 { CcǓǔЫыႫⴋᾃ{ἃι}ῧ{ῧ}ⰃⰳⱧⱨ𐐇𐐯 }
- \__str_tmp:NNn 6 8 { DdČčŰűЬьҐґӴӵႬⴌṘṙẼẽᾄ{ἄι}ῨῠⰄⰴⳌⳍꙈꙉ𐐈𐐰 }
- \__str_tmp:NNn 6 9 { EeǕǖЭэႭⴍᾅ{ἅι}ῩῡⰅⰵⱩⱪ𐐉𐐱 }
- \__str_tmp:NNn 7 0 { FfĎďŲųȺⱥЮюҒғӶӷႮⴎṚṛẾếᾆ{ἆι}ῪὺⰆⰶⳎⳏꙊꙋ𐐊𐐲 }
- \__str_tmp:NNn 7 1 { GgǗǘȻȼЯяႯⴏᾇ{ἇι}ΎύⰇⰷⱫⱬ𐐋𐐳 }
+ \__str_tmp:NNn 4 0 { ŔŕƸƹȜȝАаѴѵӘәԼլḼḽẠạὨὠῌ{ηι}ⲰⲱꚐꚑꝘꝙ𑢠𑣀 }
+ \__str_tmp:NNn 4 1 { БбԽխὩὡ𑢡𑣁 }
+ \__str_tmp:NNn 4 2 { ŖŗȞȟВвѶѷӚӛԾծḾḿẢảὪὢⲲⲳꚒꚓꝚꝛ𑢢𑣂 }
+ \__str_tmp:NNn 4 3 { ГгԿկὫὣ𑢣𑣃 }
+ \__str_tmp:NNn 4 4 { ŘřƼƽȠƞΰ{ΰ}ДдѸѹӜӝՀհṀṁẤấἈἀὬὤⅠⅰⲴⲵꚔꚕꝜꝝ𑢤𑣄 }
+ \__str_tmp:NNn 4 5 { ЕеՁձἉἁὭὥ{Ⅱ}{ⅱ}𑢥𑣅 }
+ \__str_tmp:NNn 4 6 { ŚśȢȣЖжѺѻӞӟՂղṂṃẦầἊἂὮὦῒ{ῒ}{Ⅲ}{ⅲ}ⲶⲷꚖꚗꝞꝟ𑢦𑣆 }
+ \__str_tmp:NNn 4 7 { ЗзՃճἋἃὯὧΐ{ΐ}{Ⅳ}{ⅳ}𑢧𑣇 }
+ \__str_tmp:NNn 4 8 { ŜŝȤȥИиѼѽӠӡՄմṄṅẨẩἌἄⅤⅴⲸⲹꚘꚙꝠꝡ𑢨𑣈 }
+ \__str_tmp:NNn 4 9 { ЙйՅյἍἅ{Ⅵ}{ⅵ}𑢩𑣉 }
+ \__str_tmp:NNn 5 0 { ŞşȦȧКкѾѿӢӣՆնṆṇẪẫἎἆῖ{ῖ}{Ⅶ}{ⅶ}ⲺⲻꚚꚛꝢꝣ𑢪𑣊 }
+ \__str_tmp:NNn 5 1 { ЛлՇշἏἇῗ{ῗ}{Ⅷ}{ⅷ}𑢫𑣋 }
+ \__str_tmp:NNn 5 2 { Šš{DŽ}{dž}ȨȩМмҀҁӤӥՈոṈṉẬậῘῐ{Ⅸ}{ⅸ}ⲼⲽꝤꝥ𑢬𑣌 }
+ \__str_tmp:NNn 5 3 { {Dž}{dž}НнՉչῙῑⅩⅹ𑢭𑣍 }
+ \__str_tmp:NNn 5 4 { ŢţȪȫОоӦӧՊպṊṋẮắῚὶ{Ⅺ}{ⅺ}ⲾⲿꝦꝧ𑢮𑣎 }
+ \__str_tmp:NNn 5 5 { {LJ}{lj}ПпՋջΊί{Ⅻ}{ⅻ}𑢯𑣏 }
+ \__str_tmp:NNn 5 6 { ĀāŤť{Lj}{lj}ȬȭРрӨөՌռႠⴀṌṍẰằⅬⅼⳀⳁꝨꝩ{ff}{ff}𑢰𑣐 }
+ \__str_tmp:NNn 5 7 { СсՍսႡⴁⅭⅽ{fi}{fi}𑢱𑣑 }
+ \__str_tmp:NNn 5 8 { ĂăŦŧ{NJ}{nj}ȮȯТтӪӫՎվႢⴂṎṏẲẳⅮⅾⳂⳃꝪꝫ{fl}{fl}𑢲𑣒 }
+ \__str_tmp:NNn 5 9 { {Nj}{nj}УуՏտႣⴃⅯⅿ{ffi}{ffi}𑢳𑣓 }
+ \__str_tmp:NNn 6 0 { ĄąŨũȰȱФфӬӭՐրႤⴄṐṑẴẵἘἐⱠⱡⳄⳅꙀꙁꝬꝭ{ffl}{ffl}𐐀𐐨𑢴𑣔 }
+ \__str_tmp:NNn 6 1 { ǍǎХхՑցႥⴅἙἑ{ſt}{st}𐐁𐐩𑢵𑣕 }
+ \__str_tmp:NNn 6 2 { ĆćŪūȲȳςσЦцҊҋӮӯՒւႦⴆṒṓẶặἚἒῢ{ῢ}ⱢɫⳆⳇꙂꙃꝮꝯ{st}{st}𐐂𐐪𑢶𑣖 }
+ \__str_tmp:NNn 6 3 { ǏǐЧчՓփႧⴇἛἓΰ{ΰ}Ᵽᵽ𐐃𐐫𑢷𑣗 }
+ \__str_tmp:NNn 6 4 { ĈĉŬŭШшҌҍӰӱՔքႨⴈṔṕẸẹἜἔᾀ{ἀι}ῤ{ῤ}ⰀⰰⱤɽⳈⳉꙄꙅ𐐄𐐬𑢸𑣘 }
+ \__str_tmp:NNn 6 5 { AaǑǒЩщՕօႩⴉἝἕᾁ{ἁι}Ⰱⰱ𐐅𐐭𑢹𑣙 }
+ \__str_tmp:NNn 6 6 { BbĊċŮůЪъҎҏӲӳՖֆႪⴊṖṗẺẻᾂ{ἂι}ῦ{ῦ}ⰂⰲⳊⳋꙆꙇ𐐆𐐮𑢺𑣚 }
+ \__str_tmp:NNn 6 7 { CcǓǔЫыႫⴋᾃ{ἃι}ῧ{ῧ}ⰃⰳⱧⱨ𐐇𐐯𑢻𑣛 }
+ \__str_tmp:NNn 6 8 { DdČčŰűЬьҐґӴӵႬⴌṘṙẼẽᾄ{ἄι}ῨῠⰄⰴⳌⳍꙈꙉ𐐈𐐰𑢼𑣜 }
+ \__str_tmp:NNn 6 9 { EeǕǖЭэႭⴍᾅ{ἅι}ῩῡⰅⰵⱩⱪ𐐉𐐱𑢽𑣝 }
+ \__str_tmp:NNn 7 0 { FfĎďŲųȺⱥЮюҒғӶӷႮⴎṚṛẾếᾆ{ἆι}ῪὺⰆⰶⳎⳏꙊꙋ𐐊𐐲𑢾𑣞 }
+ \__str_tmp:NNn 7 1 { GgǗǘȻȼЯяႯⴏᾇ{ἇι}ΎύⰇⰷⱫⱬ𐐋𐐳𑢿𑣟 }
\__str_tmp:NNn 7 2 { HhĐđŴŵҔҕӸӹႰⴐṜṝỀềᾈ{ἀι}ῬῥⰈⰸⳐⳑꙌꙍ𐐌𐐴 }
\__str_tmp:NNn 7 3 { IiǙǚȽƚႱⴑᾉ{ἁι}ⰉⰹⱭɑꝹꝺ𐐍𐐵 }
\__str_tmp:NNn 7 4 { JjĒēŶŷȾⱦҖҗӺӻႲⴒṞṟỂểᾊ{ἂι}ⰊⰺⱮɱⳒⳓꙎꙏ𐐎𐐶 }
- \__str_tmp:NNn 7 5 { KkǛǜϏϗႳⴓᾋ{ἃι}ⰋⰻⱯɐꝻꝼﬓ{մն}𐐏𐐷 }
- \__str_tmp:NNn 7 6 { LlĔĕŸÿϐβҘҙӼӽႴⴔṠṡỄễἨἠᾌ{ἄι}ⰌⰼⱰɒⳔⳕꙐꙑﬔ{մե}𐐐𐐸 }
- \__str_tmp:NNn 7 7 { MmŹźɁɂϑθႵⴕἩἡᾍ{ἅι}ⰍⰽꝽᵹﬕ{մի}𐐑𐐹 }
- \__str_tmp:NNn 7 8 { NnĖėǞǟҚқӾӿႶⴖṢṣỆệἪἢᾎ{ἆι}ῲ{ὼι}ⰎⰾⱲⱳⳖⳗꙒꙓꝾꝿﬖ{վն}𐐒𐐺 }
- \__str_tmp:NNn 7 9 { OoŻżɃƀႷⴗἫἣᾏ{ἇι}ῳ{ωι}ↃↄⰏⰿﬗ{մխ}𐐓𐐻 }
+ \__str_tmp:NNn 7 5 { KkǛǜϏϗႳⴓᾋ{ἃι}ⰋⰻⱯɐꝻꝼ{ﬓ}{մն}𐐏𐐷 }
+ \__str_tmp:NNn 7 6 { LlĔĕŸÿϐβҘҙӼӽႴⴔṠṡỄễἨἠᾌ{ἄι}ⰌⰼⱰɒⳔⳕꙐꙑ{ﬔ}{մե}𐐐𐐸 }
+ \__str_tmp:NNn 7 7 { MmŹźɁɂϑθႵⴕἩἡᾍ{ἅι}ⰍⰽꝽᵹ{ﬕ}{մի}𐐑𐐹 }
+ \__str_tmp:NNn 7 8 { NnĖėǞǟҚқӾӿႶⴖṢṣỆệἪἢᾎ{ἆι}ῲ{ὼι}ⰎⰾⱲⱳⳖⳗꙒꙓꝾꝿ{ﬖ}{վն}𐐒𐐺 }
+ \__str_tmp:NNn 7 9 { OoŻżɃƀႷⴗἫἣᾏ{ἇι}ῳ{ωι}ↃↄⰏⰿ{ﬗ}{մխ}𐐓𐐻 }
\__str_tmp:NNn 8 0 { PpĘęǠǡɄʉͰͱҜҝԀԁႸⴘḀḁṤṥỈỉἬἤᾐ{ἠι}ῴ{ώι}ⰐⱀⳘⳙꙔꙕꞀꞁ𐐔𐐼 }
\__str_tmp:NNn 8 1 { QqµμŽžɅʌϕφႹⴙἭἥᾑ{ἡι}ⰑⱁⱵⱶ𐐕𐐽 }
\__str_tmp:NNn 8 2 { RrĚěǢǣɆɇͲͳϖπҞҟԂԃႺⴚḂḃṦṧỊịἮἦᾒ{ἢι}ῶ{ῶ}ⰒⱂⳚⳛꙖꙗꞂꞃ𐐖𐐾 }
@@ -163,216 +370,9 @@
\__str_tmp:NNn 9 2 { ÀàĤĥǬǭϠϡҨҩԌԍჄⴤḌḍṰṱỔổἸἰᾜ{ἤι}ⰜⱌⲀⲁꙠꙡꜨꜩ𐐠𐑈 }
\__str_tmp:NNn 9 3 { ÁáƉɖჅⴥἹἱᾝ{ἥι}ⰝⱍꞍɥ𐐡𐑉 }
\__str_tmp:NNn 9 4 { ÂâĦħƊɗǮǯϢϣҪҫԎԏḎḏṲṳỖỗἺἲᾞ{ἦι}ⰞⱎⲂⲃꙢꙣꜪꜫ𐐢𐑊 }
- \__str_tmp:NNn 9 5 { ÃãƋƌჇⴧἻἳᾟ{ἧι}Ⱏⱏ𐐣𐑋 }
+ \__str_tmp:NNn 9 5 { ÃãƋƌͿϳჇⴧἻἳᾟ{ἧι}Ⱏⱏ𐐣𐑋 }
\__str_tmp:NNn 9 6 { ÄäĨĩǰ{ǰ}ϤϥҬҭԐԑḐḑṴṵỘộἼἴᾠ{ὠι}ⰠⱐⲄⲅꙤꙥꜬꜭꞐꞑ𐐤𐑌 }
- \__str_tmp:NNn 9 7 { ÅåDZdzἽἵᾡ{ὡι}Ⱑⱑ𐐥𐑍 }
- \__str_tmp:NNn 9 8 { ÆæĪīƎǝDzdzϦϧҮүԒԓḒḓṶṷỚớἾἶᾢ{ὢι}ℲⅎⒶⓐⰢⱒⲆⲇꙦꙧꜮꜯꞒꞓ𐐦𐑎 }
+ \__str_tmp:NNn 9 7 { Åå{DZ}{dz}Ἵἵᾡ{ὡι}Ⱑⱑ𐐥𐑍 }
+ \__str_tmp:NNn 9 8 { ÆæĪīƎǝ{Dz}{dz}ϦϧҮүԒԓḒḓṶṷỚớἾἶᾢ{ὢι}ℲⅎⒶⓐⰢⱒⲆⲇꙦꙧꜮꜯꞒꞓ𐐦𐑎 }
\__str_tmp:NNn 9 9 { ÇçƏəἿἷᾣ{ὣι}ⒷⓑⰣⱓⳫⳬ𐐧𐑏 }
\group_end:
-\tl_const:cn { c__tl_upper_0_0_tl } { dDьЬոՈὀὈᾤ{ὬΙ}ⳬⳫ𐐨𐐀 }
-\tl_const:cn { c__tl_upper_0_1_tl } { eEĭĬǵǴəƏϩϨэЭұҰԕԔչՉḕḔṹṸờỜὁὉᾥ{ὭΙ}ⲉⲈꙩꙨ𐐩𐐁 }
-\tl_const:cn { c__tl_upper_0_2_tl } { fFƒƑюЮպՊὂὊᾦ{ὮΙ}ⳮⳭ𐐪𐐂 }
-\tl_const:cn { c__tl_upper_0_3_tl } { gGįĮɛƐϫϪяЯҳҲԗԖջՋḗḖṻṺởỞὃὋᾧ{ὯΙ}ⲋⲊꙫꙪꜳꜲ𐐫𐐃 }
-\tl_const:cn { c__tl_upper_0_4_tl } { hHѐЀռՌὄὌ𐐬𐐄 }
-\tl_const:cn { c__tl_upper_0_5_tl } { iIıIƕǶǹǸϭϬёЁҵҴԙԘսՍḙḘṽṼỡỠὅὍⲍⲌꙭꙬꜵꜴ𐐭𐐅 }
-\tl_const:cn { c__tl_upper_0_6_tl } { jJђЂվՎ𐐮𐐆 }
-\tl_const:cn { c__tl_upper_0_7_tl } { kKijIJǻǺϯϮѓЃҷҶԛԚտՏḛḚṿṾợỢⲏⲎⳳⳲꜷꜶ𐐯𐐇 }
-\tl_const:cn { c__tl_upper_0_8_tl } { lLɠƓϰΚєЄրՐ𐐰𐐈 }
-\tl_const:cn { c__tl_upper_0_9_tl } { mMĵĴƙƘǽǼϱΡѕЅҹҸԝԜցՑḝḜẁẀụỤⲑⲐꜹꜸ𐐱𐐉 }
-\tl_const:cn { c__tl_upper_1_0_tl } { nNƚȽϲϹіІւՒ𐐲𐐊 }
-\tl_const:cn { c__tl_upper_1_1_tl } { oOķĶǿǾɣƔїЇһҺԟԞփՓḟḞẃẂủỦⲓⲒꜻꜺ𐐳𐐋 }
-\tl_const:cn { c__tl_upper_1_2_tl } { pPјЈքՔᾰᾸⰰⰀ𐐴𐐌 }
-\tl_const:cn { c__tl_upper_1_3_tl } { qQȁȀɥꞍϵΕљЉҽҼԡԠօՕḡḠẅẄứỨᾱᾹⰱⰁⲕⲔꜽꜼꞡꞠ𐐵𐐍 }
-\tl_const:cn { c__tl_upper_1_4_tl } { rRĺĹƞȠɦꞪњЊֆՖⰲⰂ𐐶𐐎 }
-\tl_const:cn { c__tl_upper_1_5_tl } { sSȃȂћЋҿҾԣԢḣḢẇẆừỪᾳ{ΑΙ}ⰳⰃⲗⲖꜿꜾꞣꞢ𐐷𐐏 }
-\tl_const:cn { c__tl_upper_1_6_tl } { tTļĻɨƗϸϷќЌⰴⰄ𐐸𐐐 }
-\tl_const:cn { c__tl_upper_1_7_tl } { uUơƠȅȄɩƖѝЍԥԤḥḤẉẈửỬὑὙⰵⰅⲙⲘꝁꝀꞥꞤ𐐹𐐑 }
-\tl_const:cn { c__tl_upper_1_8_tl } { vVľĽўЎӂӁⰶⰆ𐐺𐐒 }
-\tl_const:cn { c__tl_upper_1_9_tl } { wWƣƢȇȆɫⱢϻϺџЏԧԦḧḦẋẊữỮὓὛⰷⰇⲛⲚꝃꝂꞧꞦ𐐻𐐓 }
-\tl_const:cn { c__tl_upper_2_0_tl } { xXŀĿӄӃⰸⰈⴀႠ𐐼𐐔 }
-\tl_const:cn { c__tl_upper_2_1_tl } { yYƥƤȉȈѡѠḩḨẍẌựỰὕὝⰹⰉⲝⲜⴁႡꝅꝄꞩꞨ𐐽𐐕 }
-\tl_const:cn { c__tl_upper_2_2_tl } { zZłŁӆӅⰺⰊⴂႢ𐐾𐐖 }
-\tl_const:cn { c__tl_upper_2_3_tl } { ȋȊɯƜѣѢḫḪẏẎỳỲὗὟⰻⰋⲟⲞⴃႣꝇꝆ𐐿𐐗 }
-\tl_const:cn { c__tl_upper_2_4_tl } { àÀńŃƨƧӈӇⓐⒶⰼⰌⴄႤ𐑀𐐘 }
-\tl_const:cn { c__tl_upper_2_5_tl } { áÁȍȌɱⱮѥѤḭḬẑẐỵỴⓑⒷⰽⰍⲡⲠⴅႥꚁꚀꝉꝈ𐑁𐐙 }
-\tl_const:cn { c__tl_upper_2_6_tl } { âÂņŅɲƝӊӉιΙⅎℲⓒⒸⰾⰎⴆႦ𐑂𐐚 }
-\tl_const:cn { c__tl_upper_2_7_tl } { ãÃȏȎѧѦḯḮẓẒỷỶⓓⒹⰿⰏⲣⲢⴇႧꚃꚂꝋꝊ𐑃𐐛 }
-\tl_const:cn { c__tl_upper_2_8_tl } { äÄňŇӌӋⓔⒺⱀⰐⴈႨ𐑄𐐜 }
-\tl_const:cn { c__tl_upper_2_9_tl } { åÅƭƬȑȐɵƟѩѨḱḰẕẔỹỸⓕⒻⱁⰑⲥⲤⴉႩꚅꚄꝍꝌ𐑅𐐝 }
-\tl_const:cn { c__tl_upper_3_0_tl } { æÆӎӍⓖⒼⱂⰒⴊႪ𐑆𐐞 }
-\tl_const:cn { c__tl_upper_3_1_tl } { çÇŋŊȓȒѫѪӏӀḳḲỻỺῃ{ΗΙ}ⓗⒽⱃⰓⲧⲦⴋႫꚇꚆꝏꝎ𐑇𐐟 }
-\tl_const:cn { c__tl_upper_3_2_tl } { èÈưƯὠὨⓘⒾⱄⰔⴌႬ𐑈𐐠 }
-\tl_const:cn { c__tl_upper_3_3_tl } { éÉōŌȕȔѭѬӑӐḵḴỽỼὡὩⓙⒿⱅⰕⲩⲨⴍႭꚉꚈꝑꝐ𐑉𐐡 }
-\tl_const:cn { c__tl_upper_3_4_tl } { êÊὢὪⓚⓀⱆⰖⴎႮ𐑊𐐢 }
-\tl_const:cn { c__tl_upper_3_5_tl } { ëËŏŎȗȖѯѮӓӒḷḶẛṠỿỾὣὫⓛⓁⱇⰗⲫⲪⴏႯꚋꚊꝓꝒ𐑋𐐣 }
-\tl_const:cn { c__tl_upper_3_6_tl } { ìÌƴƳἀἈὤὬⓜⓂⱈⰘⴐႰ𐑌𐐤 }
-\tl_const:cn { c__tl_upper_3_7_tl } { íÍőŐșȘɽⱤͅΙѱѰӕӔḹḸἁἉὥὭⓝⓃⱉⰙⲭⲬⴑႱꚍꚌꝕꝔ𐑍𐐥 }
-\tl_const:cn { c__tl_upper_3_8_tl } { îÎƶƵἂἊὦὮⓞⓄⱊⰚⴒႲ𐑎𐐦 }
-\tl_const:cn { c__tl_upper_3_9_tl } { ïÏœŒțȚѳѲӗӖḻḺἃἋὧὯⓟⓅⱋⰛⲯⲮⴓႳꚏꚎꝗꝖ𐑏𐐧 }
-\tl_const:cn { c__tl_upper_4_0_tl } { ðÐʀƦάΆἄἌⓠⓆⱌⰜⴔႴ }
-\tl_const:cn { c__tl_upper_4_1_tl } { ñÑŕŔƹƸȝȜέΈѵѴәӘḽḼạẠἅἍⓡⓇⱍⰝⲱⲰⴕႵꚑꚐꝙꝘ }
-\tl_const:cn { c__tl_upper_4_2_tl } { òÒήΉἆἎⓢⓈⱎⰞⴖႶ }
-\tl_const:cn { c__tl_upper_4_3_tl } { óÓŗŖȟȞʃƩίΊѷѶӛӚḿḾảẢἇἏⓣⓉⱏⰟⲳⲲⴗႷꚓꚒꝛꝚ }
-\tl_const:cn { c__tl_upper_4_4_tl } { ôÔῐῘⓤⓊⱐⰠⴘႸ }
-\tl_const:cn { c__tl_upper_4_5_tl } { õÕřŘƽƼαΑѹѸӝӜᵹꝽṁṀấẤῑῙⓥⓋⱑⰡⲵⲴⴙႹꚕꚔꝝꝜaA }
-\tl_const:cn { c__tl_upper_4_6_tl } { öÖβΒⓦⓌⱒⰢⴚႺbB }
-\tl_const:cn { c__tl_upper_4_7_tl } { śŚƿǷȣȢγΓѻѺӟӞṃṂầẦⓧⓍⱓⰣⲷⲶⴛႻꚗꚖꝟꝞcC }
-\tl_const:cn { c__tl_upper_4_8_tl } { øØʈƮδΔὰᾺⓨⓎⱔⰤⴜႼdD }
-\tl_const:cn { c__tl_upper_4_9_tl } { ùÙŝŜȥȤʉɄεΕѽѼӡӠᵽⱣṅṄẩẨάΆⓩⓏⱕⰥⲹⲸⴝႽꝡꝠeE }
-\tl_const:cn { c__tl_upper_5_0_tl } { úÚʊƱζΖὲῈⱖⰦⴞႾfF }
-\tl_const:cn { c__tl_upper_5_1_tl } { ûÛşŞȧȦʋƲηΗѿѾӣӢṇṆẫẪέΈⱗⰧⲻⲺⴟႿꝣꝢgG }
-\tl_const:cn { c__tl_upper_5_2_tl } { üÜʌɅθΘἐἘὴῊⱘⰨⴠჀhH }
-\tl_const:cn { c__tl_upper_5_3_tl } { ýÝšŠDžDŽȩȨιΙҁҀӥӤṉṈậẬἑἙήΉⱙⰩⲽⲼⴡჁꝥꝤiI }
-\tl_const:cn { c__tl_upper_5_4_tl } { þÞdžDŽκΚἒἚὶῚⱚⰪⴢჂjJ }
-\tl_const:cn { c__tl_upper_5_5_tl } { ÿŸţŢȫȪλΛӧӦṋṊắẮἓἛίΊⱛⰫⲿⲾⴣჃꝧꝦkK }
-\tl_const:cn { c__tl_upper_5_6_tl } { LjLJμΜἔἜὸῸⱜⰬⴤჄlL }
-\tl_const:cn { c__tl_upper_5_7_tl } { āĀťŤljLJȭȬνΝөӨṍṌằẰἕἝόΌⱝⰭⳁⳀⴥჅꝩꝨmM }
-\tl_const:cn { c__tl_upper_5_8_tl } { ʒƷξΞὺῪⱞⰮnN }
-\tl_const:cn { c__tl_upper_5_9_tl } { ăĂŧŦNjNJȯȮοΟӫӪṏṎẳẲύΎⳃⳂⴧჇꝫꝪoO }
-\tl_const:cn { c__tl_upper_6_0_tl } { njNJπΠὼῺῠῨⅰⅠpP }
-\tl_const:cn { c__tl_upper_6_1_tl } { ąĄũŨȱȰρΡӭӬṑṐẵẴώΏῡῩⅱⅡⱡⱠⳅⳄꙁꙀꝭꝬqQ }
-\tl_const:cn { c__tl_upper_6_2_tl } { ǎǍςΣⅲⅢrR }
-\tl_const:cn { c__tl_upper_6_3_tl } { ćĆūŪȳȲσΣҋҊӯӮṓṒặẶⅳⅣⳇⳆꙃꙂꝯꝮsS }
-\tl_const:cn { c__tl_upper_6_4_tl } { ǐǏτΤᾀ{ἈΙ}ⅴⅤtT }
-\tl_const:cn { c__tl_upper_6_5_tl } { ĉĈŭŬυΥҍҌӱӰṕṔẹẸᾁ{ἉΙ}ῥῬⅵⅥⱥȺⳉⳈⴭჍꙅꙄuU }
-\tl_const:cn { c__tl_upper_6_6_tl } { ǒǑφΦᾂ{ἊΙ}ⅶⅦⱦȾvV }
-\tl_const:cn { c__tl_upper_6_7_tl } { ċĊůŮχΧҏҎӳӲṗṖẻẺᾃ{ἋΙ}ⅷⅧⳋⳊꙇꙆwW }
-\tl_const:cn { c__tl_upper_6_8_tl } { ǔǓψΨἠἨᾄ{ἌΙ}ⅸⅨⱨⱧxX }
-\tl_const:cn { c__tl_upper_6_9_tl } { čČűŰωΩґҐӵӴṙṘẽẼἡἩᾅ{ἍΙ}ⅹⅩⳍⳌꙉꙈyY }
-\tl_const:cn { c__tl_upper_7_0_tl } { ǖǕϊΪἢἪᾆ{ἎΙ}ⅺⅪⱪⱩzZ }
-\tl_const:cn { c__tl_upper_7_1_tl } { ďĎųŲϋΫғҒӷӶṛṚếẾἣἫᾇ{ἏΙ}ⅻⅫⳏⳎꙋꙊ }
-\tl_const:cn { c__tl_upper_7_2_tl } { ǘǗȼȻόΌаАἤἬⅼⅬⱬⱫ }
-\tl_const:cn { c__tl_upper_7_3_tl } { đĐŵŴύΎбБҕҔӹӸṝṜềỀἥἭⅽⅭⳑⳐꙍꙌ }
-\tl_const:cn { c__tl_upper_7_4_tl } { ǚǙώΏвВἦἮⅾⅮꝺꝹ }
-\tl_const:cn { c__tl_upper_7_5_tl } { ēĒŷŶȿⱾгГҗҖӻӺṟṞểỂἧἯⅿⅯⳓⳒꙏꙎ }
-\tl_const:cn { c__tl_upper_7_6_tl } { ǜǛɀⱿϐΒдДꝼꝻ }
-\tl_const:cn { c__tl_upper_7_7_tl } { ĕĔǝƎϑΘеЕҙҘӽӼաԱṡṠễỄⳕⳔꙑꙐ }
-\tl_const:cn { c__tl_upper_7_8_tl } { źŹɂɁжЖբԲ }
-\tl_const:cn { c__tl_upper_7_9_tl } { ėĖǟǞзЗқҚӿӾգԳṣṢệỆῳ{ΩΙ}ⱳⱲⳗⳖꙓꙒꝿꝾ }
-\tl_const:cn { c__tl_upper_8_0_tl } { żŻиИդԴᾐ{ἨΙ}ↄↃ }
-\tl_const:cn { c__tl_upper_8_1_tl } { µΜęĘǡǠͱͰϕΦйЙҝҜԁԀեԵḁḀṥṤỉỈᾑ{ἩΙ}ⳙⳘꙕꙔꞁꞀ }
-\tl_const:cn { c__tl_upper_8_2_tl } { žŽϖΠкКզԶᾒ{ἪΙ}ⱶⱵ }
-\tl_const:cn { c__tl_upper_8_3_tl } { ěĚſSǣǢɇɆͳͲϗϏлЛҟҞԃԂէԷḃḂṧṦịỊᾓ{ἫΙ}ⳛⳚꙗꙖꞃꞂ }
-\tl_const:cn { c__tl_upper_8_4_tl } { ƀɃмМըԸἰἸᾔ{ἬΙ} }
-\tl_const:cn { c__tl_upper_8_5_tl } { ĝĜǥǤɉɈϙϘнНҡҠԅԄթԹḅḄṩṨọỌἱἹᾕ{ἭΙ}ⳝⳜꙙꙘꞅꞄ }
-\tl_const:cn { c__tl_upper_8_6_tl } { оОժԺἲἺᾖ{ἮΙ} }
-\tl_const:cn { c__tl_upper_8_7_tl } { ğĞƃƂǧǦɋɊͷͶϛϚпПңҢԇԆիԻḇḆṫṪỏỎἳἻᾗ{ἯΙ}ⳟⳞꙛꙚꜣꜢꞇꞆ }
-\tl_const:cn { c__tl_upper_8_8_tl } { рРլԼἴἼ }
-\tl_const:cn { c__tl_upper_8_9_tl } { ġĠƅƄǩǨɍɌϝϜсСҥҤԉԈխԽḉḈṭṬốỐἵἽⳡⳠꙝꙜꜥꜤ }
-\tl_const:cn { c__tl_upper_9_0_tl } { тТծԾἶἾ }
-\tl_const:cn { c__tl_upper_9_1_tl } { ģĢǫǪɏɎͻϽϟϞуУҧҦԋԊկԿḋḊṯṮồỒἷἿⳣⳢꙟꙞꜧꜦ }
-\tl_const:cn { c__tl_upper_9_2_tl } { ƈƇɐⱯͼϾфФհՀꞌꞋ }
-\tl_const:cn { c__tl_upper_9_3_tl } { ĥĤǭǬɑⱭͽϿϡϠхХҩҨԍԌձՁḍḌṱṰổỔⲁⲀꙡꙠꜩꜨ }
-\tl_const:cn { c__tl_upper_9_4_tl } { ɒⱰцЦղՂ }
-\tl_const:cn { c__tl_upper_9_5_tl } { ħĦǯǮɓƁϣϢчЧҫҪԏԎճՃḏḎṳṲỗỖⲃⲂꙣꙢꜫꜪ }
-\tl_const:cn { c__tl_upper_9_6_tl } { ƌƋɔƆшШմՄᾠ{ὨΙ} }
-\tl_const:cn { c__tl_upper_9_7_tl } { aAĩĨϥϤщЩҭҬԑԐյՅḑḐṵṴộỘᾡ{ὩΙ}ⲅⲄꙥꙤꜭꜬꞑꞐ }
-\tl_const:cn { c__tl_upper_9_8_tl } { bBDzDZɖƉъЪնՆᾢ{ὪΙ} }
-\tl_const:cn { c__tl_upper_9_9_tl } { cCīĪdzDZɗƊϧϦыЫүҮԓԒշՇḓḒṷṶớỚᾣ{ὫΙ}ⲇⲆꙧꙦꜯꜮꞓꞒ }
-\tl_const:cn { c__tl_lower_0_0_tl } { ÈèĬĭƐɛǴǵϨϩҰұԔԕḔḕṸṹỜờⒸⓒⰤⱔⲈⲉꙨꙩ }
-\tl_const:cn { c__tl_lower_0_1_tl } { ÉéƑƒჍⴭⒹⓓⰥⱕⳭⳮ }
-\tl_const:cn { c__tl_lower_0_2_tl } { ÊêĮįǶƕΆάϪϫҲҳԖԗḖḗṺṻỞởⒺⓔⰦⱖⲊⲋꙪꙫꜲꜳ }
-\tl_const:cn { c__tl_lower_0_3_tl } { ËëƓɠǷƿⒻⓕⰧⱗ }
-\tl_const:cn { c__tl_lower_0_4_tl } { Ììİ{i̇}ƔɣǸǹΈέϬϭҴҵԘԙḘḙṼṽỠỡᾨᾠⒼⓖⰨⱘⲌⲍꙬꙭꜴꜵ }
-\tl_const:cn { c__tl_lower_0_5_tl } { ÍíΉήᾩᾡⒽⓗⰩⱙ }
-\tl_const:cn { c__tl_lower_0_6_tl } { ÎîIJijƖɩǺǻΊίϮϯҶҷԚԛḚḛṾṿỢợᾪᾢⒾⓘⰪⱚⲎⲏⳲⳳꜶꜷ }
-\tl_const:cn { c__tl_lower_0_7_tl } { ÏïƗɨᾫᾣⒿⓙⰫⱛ }
-\tl_const:cn { c__tl_lower_0_8_tl } { ÐðĴĵƘƙǼǽΌόҸҹԜԝḜḝẀẁỤụὈὀᾬᾤⓀⓚⰬⱜⲐⲑꜸꜹ }
-\tl_const:cn { c__tl_lower_0_9_tl } { ÑñὉὁᾭᾥⓁⓛⰭⱝ }
-\tl_const:cn { c__tl_lower_1_0_tl } { ÒòĶķǾǿΎύҺһԞԟḞḟẂẃỦủὊὂᾮᾦⓂⓜⰮⱞⲒⲓꜺꜻ }
-\tl_const:cn { c__tl_lower_1_1_tl } { ÓóΏώὋὃᾯᾧⓃⓝ }
-\tl_const:cn { c__tl_lower_1_2_tl } { ÔôƜɯȀȁϴθҼҽԠԡḠḡẄẅỨứὌὄⓄⓞⲔⲕꜼꜽꞠꞡ }
-\tl_const:cn { c__tl_lower_1_3_tl } { ÕõĹĺƝɲΑαὍὅⓅⓟAa }
-\tl_const:cn { c__tl_lower_1_4_tl } { ÖöȂȃΒβҾҿԢԣḢḣẆẇỪừⓆⓠⲖⲗꜾꜿꞢꞣBb }
-\tl_const:cn { c__tl_lower_1_5_tl } { ĻļƟɵΓγϷϸⓇⓡCc }
-\tl_const:cn { c__tl_lower_1_6_tl } { ØøƠơȄȅΔδӀӏԤԥḤḥẈẉỬửⓈⓢⲘⲙꝀꝁꞤꞥDd }
-\tl_const:cn { c__tl_lower_1_7_tl } { ÙùĽľΕεϹϲӁӂⓉⓣEe }
-\tl_const:cn { c__tl_lower_1_8_tl } { ÚúƢƣȆȇΖζϺϻԦԧḦḧẊẋỮữⓊⓤⲚⲛꝂꝃꞦꞧFf }
-\tl_const:cn { c__tl_lower_1_9_tl } { ÛûĿŀΗηӃӄⓋⓥGg }
-\tl_const:cn { c__tl_lower_2_0_tl } { ÜüƤƥȈȉΘθѠѡḨḩẌẍỰựᾸᾰⓌⓦⲜⲝꝄꝅꞨꞩHh }
-\tl_const:cn { c__tl_lower_2_1_tl } { ÝýŁłΙιϽͻӅӆᾹᾱⓍⓧIi }
-\tl_const:cn { c__tl_lower_2_2_tl } { ÞþƦʀȊȋΚκϾͼѢѣḪḫẎẏỲỳᾺὰⓎⓨⲞⲟꝆꝇꞪɦJj }
-\tl_const:cn { c__tl_lower_2_3_tl } { ŃńƧƨΛλϿͽӇӈΆάⓏⓩKk }
-\tl_const:cn { c__tl_lower_2_4_tl } { ȌȍΜμЀѐѤѥḬḭẐẑỴỵᾼᾳⲠⲡꚀꚁꝈꝉLl }
-\tl_const:cn { c__tl_lower_2_5_tl } { ŅņƩʃΝνЁёӉӊὙὑMm }
-\tl_const:cn { c__tl_lower_2_6_tl } { ȎȏΞξЂђѦѧḮḯẒẓỶỷⲢⲣꚂꚃꝊꝋNn }
-\tl_const:cn { c__tl_lower_2_7_tl } { ŇňΟοЃѓӋӌὛὓOo }
-\tl_const:cn { c__tl_lower_2_8_tl } { ƬƭȐȑΠπЄєѨѩḰḱẔẕỸỹⲤⲥꚄꚅꝌꝍPp }
-\tl_const:cn { c__tl_lower_2_9_tl } { ΡρЅѕӍӎԱաὝὕQq }
-\tl_const:cn { c__tl_lower_3_0_tl } { ŊŋƮʈȒȓІіѪѫԲբḲḳỺỻⲦⲧꚆꚇꝎꝏRr }
-\tl_const:cn { c__tl_lower_3_1_tl } { ƯưΣσЇїԳգὟὗSs }
-\tl_const:cn { c__tl_lower_3_2_tl } { ŌōȔȕΤτЈјѬѭӐӑԴդḴḵỼỽⲨⲩꚈꚉꝐꝑTt }
-\tl_const:cn { c__tl_lower_3_3_tl } { ƱʊΥυЉљԵեUu }
-\tl_const:cn { c__tl_lower_3_4_tl } { ŎŏƲʋȖȗΦφЊњѮѯӒӓԶզḶḷỾỿⲪⲫꚊꚋꝒꝓVv }
-\tl_const:cn { c__tl_lower_3_5_tl } { ƳƴΧχЋћԷէWw }
-\tl_const:cn { c__tl_lower_3_6_tl } { ŐőȘșΨψЌќѰѱӔӕԸըḸḹῈὲⲬⲭꚌꚍꝔꝕXx }
-\tl_const:cn { c__tl_lower_3_7_tl } { ƵƶΩωЍѝԹթΈέYy }
-\tl_const:cn { c__tl_lower_3_8_tl } { ŒœȚțΪϊЎўѲѳӖӗԺժḺḻẞßῊὴⲮⲯꚎꚏꝖꝗZz }
-\tl_const:cn { c__tl_lower_3_9_tl } { ƷʒΫϋЏџԻիΉή }
-\tl_const:cn { c__tl_lower_4_0_tl } { ŔŕƸƹȜȝАаѴѵӘәԼլḼḽẠạὨὠῌῃⲰⲱꚐꚑꝘꝙ }
-\tl_const:cn { c__tl_lower_4_1_tl } { БбԽխὩὡ }
-\tl_const:cn { c__tl_lower_4_2_tl } { ŖŗȞȟВвѶѷӚӛԾծḾḿẢảὪὢⲲⲳꚒꚓꝚꝛ }
-\tl_const:cn { c__tl_lower_4_3_tl } { ГгԿկὫὣ }
-\tl_const:cn { c__tl_lower_4_4_tl } { ŘřƼƽȠƞДдѸѹӜӝՀհṀṁẤấἈἀὬὤⅠⅰⲴⲵꚔꚕꝜꝝ }
-\tl_const:cn { c__tl_lower_4_5_tl } { ЕеՁձἉἁὭὥⅡⅱ }
-\tl_const:cn { c__tl_lower_4_6_tl } { ŚśȢȣЖжѺѻӞӟՂղṂṃẦầἊἂὮὦⅢⅲⲶⲷꚖꚗꝞꝟ }
-\tl_const:cn { c__tl_lower_4_7_tl } { ЗзՃճἋἃὯὧⅣⅳ }
-\tl_const:cn { c__tl_lower_4_8_tl } { ŜŝȤȥИиѼѽӠӡՄմṄṅẨẩἌἄⅤⅴⲸⲹꝠꝡ }
-\tl_const:cn { c__tl_lower_4_9_tl } { ЙйՅյἍἅⅥⅵ }
-\tl_const:cn { c__tl_lower_5_0_tl } { ŞşȦȧКкѾѿӢӣՆնṆṇẪẫἎἆⅦⅶⲺⲻꝢꝣ }
-\tl_const:cn { c__tl_lower_5_1_tl } { ЛлՇշἏἇⅧⅷ }
-\tl_const:cn { c__tl_lower_5_2_tl } { ŠšDŽdžȨȩМмҀҁӤӥՈոṈṉẬậῘῐⅨⅸⲼⲽꝤꝥ }
-\tl_const:cn { c__tl_lower_5_3_tl } { DždžНнՉչῙῑⅩⅹ }
-\tl_const:cn { c__tl_lower_5_4_tl } { ŢţȪȫОоӦӧՊպṊṋẮắῚὶⅪⅺⲾⲿꝦꝧ }
-\tl_const:cn { c__tl_lower_5_5_tl } { LJljПпՋջΊίⅫⅻ }
-\tl_const:cn { c__tl_lower_5_6_tl } { ĀāŤťLjljȬȭРрӨөՌռႠⴀṌṍẰằⅬⅼⳀⳁꝨꝩ }
-\tl_const:cn { c__tl_lower_5_7_tl } { СсՍսႡⴁⅭⅽ }
-\tl_const:cn { c__tl_lower_5_8_tl } { ĂăŦŧNJnjȮȯТтӪӫՎվႢⴂṎṏẲẳⅮⅾⳂⳃꝪꝫ }
-\tl_const:cn { c__tl_lower_5_9_tl } { NjnjУуՏտႣⴃⅯⅿ }
-\tl_const:cn { c__tl_lower_6_0_tl } { ĄąŨũȰȱФфӬӭՐրႤⴄṐṑẴẵἘἐⱠⱡⳄⳅꙀꙁꝬꝭ𐐀𐐨 }
-\tl_const:cn { c__tl_lower_6_1_tl } { ǍǎХхՑցႥⴅἙἑ𐐁𐐩 }
-\tl_const:cn { c__tl_lower_6_2_tl } { ĆćŪūȲȳЦцҊҋӮӯՒւႦⴆṒṓẶặἚἒⱢɫⳆⳇꙂꙃꝮꝯ𐐂𐐪 }
-\tl_const:cn { c__tl_lower_6_3_tl } { ǏǐЧчՓփႧⴇἛἓⱣᵽ𐐃𐐫 }
-\tl_const:cn { c__tl_lower_6_4_tl } { ĈĉŬŭШшҌҍӰӱՔքႨⴈṔṕẸẹἜἔⰀⰰⱤɽⳈⳉꙄꙅ𐐄𐐬 }
-\tl_const:cn { c__tl_lower_6_5_tl } { AaǑǒЩщՕօႩⴉἝἕⰁⰱ𐐅𐐭 }
-\tl_const:cn { c__tl_lower_6_6_tl } { BbĊċŮůЪъҎҏӲӳՖֆႪⴊṖṗẺẻⰂⰲⳊⳋꙆꙇ𐐆𐐮 }
-\tl_const:cn { c__tl_lower_6_7_tl } { CcǓǔЫыႫⴋⰃⰳⱧⱨ𐐇𐐯 }
-\tl_const:cn { c__tl_lower_6_8_tl } { DdČčŰűЬьҐґӴӵႬⴌṘṙẼẽῨῠⰄⰴⳌⳍꙈꙉ𐐈𐐰 }
-\tl_const:cn { c__tl_lower_6_9_tl } { EeǕǖЭэႭⴍῩῡⰅⰵⱩⱪ𐐉𐐱 }
-\tl_const:cn { c__tl_lower_7_0_tl } { FfĎďŲųȺⱥЮюҒғӶӷႮⴎṚṛẾếῪὺⰆⰶⳎⳏꙊꙋ𐐊𐐲 }
-\tl_const:cn { c__tl_lower_7_1_tl } { GgǗǘȻȼЯяႯⴏΎύⰇⰷⱫⱬ𐐋𐐳 }
-\tl_const:cn { c__tl_lower_7_2_tl } { HhĐđŴŵҔҕӸӹႰⴐṜṝỀềᾈᾀῬῥⰈⰸⳐⳑꙌꙍ𐐌𐐴 }
-\tl_const:cn { c__tl_lower_7_3_tl } { IiǙǚȽƚႱⴑᾉᾁⰉⰹⱭɑꝹꝺ𐐍𐐵 }
-\tl_const:cn { c__tl_lower_7_4_tl } { JjĒēŶŷȾⱦҖҗӺӻႲⴒṞṟỂểᾊᾂⰊⰺⱮɱⳒⳓꙎꙏ𐐎𐐶 }
-\tl_const:cn { c__tl_lower_7_5_tl } { KkǛǜϏϗႳⴓᾋᾃⰋⰻⱯɐꝻꝼ𐐏𐐷 }
-\tl_const:cn { c__tl_lower_7_6_tl } { LlĔĕŸÿҘҙӼӽႴⴔṠṡỄễἨἠᾌᾄⰌⰼⱰɒⳔⳕꙐꙑ𐐐𐐸 }
-\tl_const:cn { c__tl_lower_7_7_tl } { MmŹźɁɂႵⴕἩἡᾍᾅⰍⰽꝽᵹ𐐑𐐹 }
-\tl_const:cn { c__tl_lower_7_8_tl } { NnĖėǞǟҚқӾӿႶⴖṢṣỆệἪἢᾎᾆⰎⰾⱲⱳⳖⳗꙒꙓꝾꝿ𐐒𐐺 }
-\tl_const:cn { c__tl_lower_7_9_tl } { OoŻżɃƀႷⴗἫἣᾏᾇↃↄⰏⰿ𐐓𐐻 }
-\tl_const:cn { c__tl_lower_8_0_tl } { PpĘęǠǡɄʉͰͱҜҝԀԁႸⴘḀḁṤṥỈỉἬἤⰐⱀⳘⳙꙔꙕꞀꞁ𐐔𐐼 }
-\tl_const:cn { c__tl_lower_8_1_tl } { QqŽžɅʌႹⴙἭἥⰑⱁⱵⱶ𐐕𐐽 }
-\tl_const:cn { c__tl_lower_8_2_tl } { RrĚěǢǣɆɇͲͳҞҟԂԃႺⴚḂḃṦṧỊịἮἦⰒⱂⳚⳛꙖꙗꞂꞃ𐐖𐐾 }
-\tl_const:cn { c__tl_lower_8_3_tl } { SsႻⴛἯἧⰓⱃ𐐗𐐿 }
-\tl_const:cn { c__tl_lower_8_4_tl } { TtĜĝǤǥɈɉϘϙҠҡԄԅႼⴜḄḅṨṩỌọῸὸⰔⱄⳜⳝꙘꙙꞄꞅ𐐘𐑀 }
-\tl_const:cn { c__tl_lower_8_5_tl } { UuƁɓႽⴝΌόⰕⱅ𐐙𐑁 }
-\tl_const:cn { c__tl_lower_8_6_tl } { VvĞğƂƃǦǧɊɋͶͷϚϛҢңԆԇႾⴞḆḇṪṫỎỏῺὼΩωⰖⱆⳞⳟꙚꙛꜢꜣꞆꞇ𐐚𐑂 }
-\tl_const:cn { c__tl_lower_8_7_tl } { WwႿⴟΏώⰗⱇ𐐛𐑃 }
-\tl_const:cn { c__tl_lower_8_8_tl } { XxĠġƄƅǨǩɌɍϜϝҤҥԈԉჀⴠḈḉṬṭỐốᾘᾐῼῳⰘⱈⳠⳡꙜꙝꜤꜥ𐐜𐑄 }
-\tl_const:cn { c__tl_lower_8_9_tl } { YyჁⴡᾙᾑⰙⱉ𐐝𐑅 }
-\tl_const:cn { c__tl_lower_9_0_tl } { ZzĢģƆɔǪǫɎɏϞϟҦҧԊԋჂⴢḊḋṮṯỒồᾚᾒKkⰚⱊⱾȿⳢⳣꙞꙟꜦꜧ𐐞𐑆 }
-\tl_const:cn { c__tl_lower_9_1_tl } { ƇƈჃⴣᾛᾓÅåⰛⱋⱿɀꞋꞌ𐐟𐑇 }
-\tl_const:cn { c__tl_lower_9_2_tl } { ÀàĤĥǬǭϠϡҨҩԌԍჄⴤḌḍṰṱỔổἸἰᾜᾔⰜⱌⲀⲁꙠꙡꜨꜩ𐐠𐑈 }
-\tl_const:cn { c__tl_lower_9_3_tl } { ÁáƉɖჅⴥἹἱᾝᾕⰝⱍꞍɥ𐐡𐑉 }
-\tl_const:cn { c__tl_lower_9_4_tl } { ÂâĦħƊɗǮǯϢϣҪҫԎԏḎḏṲṳỖỗἺἲᾞᾖⰞⱎⲂⲃꙢꙣꜪꜫ𐐢𐑊 }
-\tl_const:cn { c__tl_lower_9_5_tl } { ÃãƋƌჇⴧἻἳᾟᾗⰟⱏ𐐣𐑋 }
-\tl_const:cn { c__tl_lower_9_6_tl } { ÄäĨĩϤϥҬҭԐԑḐḑṴṵỘộἼἴⰠⱐⲄⲅꙤꙥꜬꜭꞐꞑ𐐤𐑌 }
-\tl_const:cn { c__tl_lower_9_7_tl } { ÅåDZdzἽἵⰡⱑ𐐥𐑍 }
-\tl_const:cn { c__tl_lower_9_8_tl } { ÆæĪīƎǝDzdzϦϧҮүԒԓḒḓṶṷỚớἾἶℲⅎⒶⓐⰢⱒⲆⲇꙦꙧꜮꜯꞒꞓ𐐦𐑎 }
-\tl_const:cn { c__tl_lower_9_9_tl } { ÇçƏəἿἷⒷⓑⰣⱓⳫⳬ𐐧𐑏 }
-\tl_const:Nn \c__tl_mixed_exceptions_tl { ß{Ss}ff{Ff}fi{Fi}fl{Fl}ffi{Ffi}ffl{Ffl}ſt{St}st{St}և{Եւ}ﬓ{Մն}ﬔ{Մե}ﬕ{Մի}ﬖ{Վն}ﬗ{Մխ}ᾲ{Ὰͅ}ᾴ{Άͅ}ῂ{Ὴͅ}ῄ{Ήͅ}ῲ{Ὼͅ}ῴ{Ώͅ}ᾷ{ᾼ͂}ῇ{ῌ͂}ῷ{ῼ͂}DžDždžDžLjLjljLjNjNjnjNjDzDzdzDz }
-\tl_const:Nn \c__tl_std_sigma_tl {σ}
-\tl_const:Nn \c__tl_final_sigma_tl {ς}
-\tl_const:Nn \c__tl_dotless_i_tl {ı}
-\tl_const:Nn \c__tl_dot_above_tl {̇}
-\tl_const:Nn \c__tl_dotted_I_tl {İ}
-\tl_const:Nn \c__tl_accents_lt_tl {Ì{i̇̀}Í{i̇́}Ĩ{i̇̃}}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index 7f937fbcb18..244fab08545 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5203 2014-07-15 08:59:02Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 5308 2014-08-20 01:22:39Z bruno $
{L3 Experimental drivers}
\ProvidesExplFile
{l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 21b43ed87c9..c9ce3db17c8 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}[2014/07/20]
-\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3keys2e.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 5378 2014-08-25 10:59:48Z 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 ba137345670..43829b42af7 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}[2014/07/20]
-\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xparse.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: xparse.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental document command parser}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -116,7 +116,7 @@
{
\cs_if_exist:NTF #1
{
- \__msg_kernel_warning:nnxx { xparse } { redefine-command }
+ \__msg_kernel_info:nnxx { xparse } { redefine-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
{
@@ -199,7 +199,7 @@
{
\cs_if_exist:cTF {#1}
{
- \__msg_kernel_warning:nnxx { xparse } { redefine-environment }
+ \__msg_kernel_info:nnxx { xparse } { redefine-environment }
{#1} { \tl_to_str:n {#2} }
}
{
@@ -956,15 +956,15 @@
\group_align_safe_begin:
\tex_escapechar:D = 92 \scan_stop:
\tl_clear:N \l__xparse_v_arg_tl
- \peek_N_type:TF
- { \__xparse_grab_v_aux_test:N }
+ \peek_meaning_remove_ignore_spaces:NTF \c_group_begin_token
{
- \peek_meaning_remove:NTF \c_group_begin_token
- {
- \group_align_safe_end:
- \__xparse_grab_v_bgroup:
- }
- { \__xparse_grab_v_aux_abort: }
+ \group_align_safe_end:
+ \__xparse_grab_v_bgroup:
+ }
+ {
+ \peek_N_type:TF
+ { \__xparse_grab_v_aux_test:N }
+ { \__xparse_grab_v_aux_abort:n { } }
}
}
\cs_new_protected_nopar:Npn \__xparse_grab_v_group_end:
@@ -976,19 +976,19 @@
}
\cs_new_protected:Npn \__xparse_grab_v_aux_test:N #1
{
- \__xparse_grab_v_aux_put:N #1
\__xparse_grab_v_token_if_char:NTF #1
{
+ \__xparse_grab_v_aux_put:N #1
\__xparse_grab_v_aux_catcodes:
\__xparse_grab_v_aux_loop:N #1
}
- { \__xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_abort:n {#1} #1 }
}
\cs_new_protected:Npn \__xparse_grab_v_aux_loop:N #1
{
\peek_N_type:TF
{ \__xparse_grab_v_aux_loop:NN #1 }
- { \__xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_abort:n { } }
}
\cs_new_protected:Npn \__xparse_grab_v_aux_loop:NN #1 #2
{
@@ -1001,7 +1001,7 @@
\__xparse_grab_v_aux_loop:N #1
}
}
- { \__xparse_grab_v_aux_abort: #2 }
+ { \__xparse_grab_v_aux_abort:n {#2} #2 }
}
\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_loop_end:
{
@@ -1021,7 +1021,7 @@
{
\peek_N_type:TF
{ \__xparse_grab_v_bgroup_loop:N }
- { \__xparse_grab_v_aux_abort: }
+ { \__xparse_grab_v_aux_abort:n { } }
}
\cs_new_protected:Npn \__xparse_grab_v_bgroup_loop:N #1
{
@@ -1044,7 +1044,7 @@
\__xparse_grab_v_bgroup_loop:
}
}
- { \__xparse_grab_v_aux_abort: #1 }
+ { \__xparse_grab_v_aux_abort:n {#1} #1 }
}
\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_catcodes:
{
@@ -1055,28 +1055,26 @@
{ \char_set_catcode_other:n { \tex_endlinechar:D } }
{ \char_set_catcode_parameter:n { \tex_endlinechar:D } }
}
-\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_abort:
+\cs_new_protected:Npn \__xparse_grab_v_aux_abort:n #1
{
\__xparse_grab_v_group_end:
\__xparse_add_arg:o \c__xparse_no_value_tl
- \exp_after:wN \__xparse_grab_v_aux_abort:w \l__xparse_args_tl \q_stop
- }
-\cs_new_protected:Npn \__xparse_grab_v_aux_abort:w #1 #2 \q_stop
- {
\group_begin:
\char_set_lccode:nn { `\# } { \tex_endlinechar:D }
\tl_to_lowercase:n
{ \group_end: \peek_meaning_remove:NTF ## }
{
- \__msg_kernel_error:nnxx { xparse } { verbatim-newline }
- { \token_to_str:N #1 }
+ \__msg_kernel_error:nnxxx { xparse } { verbatim-newline }
+ { \exp_after:wN \token_to_str:N \l__xparse_fn_tl }
{ \tl_to_str:N \l__xparse_v_arg_tl }
+ { \tl_to_str:n {#1} }
\l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
}
{
- \__msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
- { \token_to_str:N #1 }
+ \__msg_kernel_error:nnxxx { xparse } { verbatim-tokenized }
+ { \exp_after:wN \token_to_str:N \l__xparse_fn_tl }
{ \tl_to_str:N \l__xparse_v_arg_tl }
+ { \tl_to_str:n {#1} }
\l__xparse_v_rest_of_signature_tl \l__xparse_args_tl
}
}
@@ -1515,41 +1513,45 @@
but~this~is~not~a~document~environment.
}
\__msg_kernel_new:nnnn { xparse } { verbatim-newline }
- { Verbatim~argument~of~#1~ended~by~end~of~line. }
+ { Verbatim~argument~of~'#1'~ended~by~end~of~line. }
{
- The~verbatim~argument~of~#1~cannot~contain~more~than~one~line,~but~the~end~
+ The~verbatim~argument~of~'#1'~cannot~contain~more~than~one~line,~
+ but~the~end~
of~the~current~line~has~been~reached.~You~have~probably~forgotten~the~
closing~delimiter.
\\ \\
- LaTeX~will~ignored~'#2'.
+ LaTeX~will~ignore~'#2'.
+ }
+\__msg_kernel_new:nnnn { xparse } { verbatim-tokenized }
+ {
+ The~verbatim~command~'#1'~cannot~be~used~inside~an~argument.~
}
-\__msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
- { Verbatim~command~#1~illegal~in~command~argument. }
{
- The~command~#1~takes~a~verbatim~argument.~It~may~not~appear~within~
- the~argument~of~another~function.
+ The~command~'#1'~takes~a~verbatim~argument.~
+ It~may~not~appear~within~the~argument~of~another~function.~
+ It~received~an~illegal~token \tl_if_empty:nF {#3} { ~'#3' } .
\\ \\
LaTeX~will~ignore~'#2'.
}
\__msg_kernel_new:nnn { xparse } { define-command }
{
- Defining~document~command~#1~
- with~arg.~spec.~'#2'~\msg_line_context:.
+ Defining~command~#1~
+ with~sig.~'#2'~\msg_line_context:.
}
\__msg_kernel_new:nnn { xparse } { define-environment }
{
- Defining~document~environment~'#1'~
- with~arg.~spec.~'#2'~\msg_line_context:.
+ Defining~environment~'#1'~
+ with~sig.~'#2'~\msg_line_context:.
}
\__msg_kernel_new:nnn { xparse } { redefine-command }
{
- Redefining~document~command~#1~
- with~arg.~spec.~'#2'~\msg_line_context:.
+ Redefining~command~#1~
+ with~sig.~'#2'~\msg_line_context:.
}
\__msg_kernel_new:nnn { xparse } { redefine-environment }
{
- Redefining~document~environment~'#1'~
- with~arg.~spec.~'#2'~\msg_line_context:.
+ Redefining~environment~'#1'~
+ with~sig.~'#2'~\msg_line_context:.
}
\cs_new_eq:NN \BooleanFalse \c_false_bool
\cs_new_eq:NN \BooleanTrue \c_true_bool
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index b9638f5aa71..7dd8e7b35b0 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}[2014/07/20]
-\@ifpackagelater{expl3}{2014/07/20}
+\RequirePackage{expl3}[2014/08/25]
+\@ifpackagelater{expl3}{2014/08/25}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 5241 2014-07-20 09:44:41Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 5378 2014-08-25 10:59:48Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}