[latex3-commits] [l3svn] 03/03: Trim off trailing whitespace

noreply at latex-project.org noreply at latex-project.org
Thu Sep 10 20:58:19 CEST 2015


This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit ab3700867e35a102a34648b479e357d7e87bff32
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Sep 10 19:57:56 2015 +0100

    Trim off trailing whitespace
---
 README.md                                          |    2 +-
 articles/lua-test-suite.tex                        |   16 ++--
 l3build/README.md                                  |    2 +-
 l3build/l3build.dtx                                |   24 ++---
 l3build/l3build.lua                                |   26 +++---
 l3build/testfiles-plain/plain-pdftex.lvt           |    2 +-
 l3build/testfiles/00-test-1.lvt                    |    2 +-
 l3experimental/l3sort/testfiles/m3sort001.lvt      |    2 +-
 l3experimental/l3sort/testfiles/m3sort002.lvt      |    2 +-
 l3experimental/l3str/testfiles/m3regex010.lvt      |    2 +-
 .../l3str/testfiles/m3tl-analysis001.lvt           |    2 +-
 l3experimental/xgalley/l3galley.dtx                |   10 +-
 l3kernel/expl3.dtx                                 |    4 +-
 l3kernel/l3basics.dtx                              |    2 +-
 l3kernel/l3bootstrap.dtx                           |    8 +-
 l3kernel/l3doc.dtx                                 |    2 +-
 l3kernel/l3expan.dtx                               |   16 ++--
 l3kernel/l3format.ins                              |    2 +-
 l3kernel/l3fp-convert.dtx                          |    2 +-
 l3kernel/l3keys.dtx                                |   10 +-
 l3kernel/l3luatex.dtx                              |    6 +-
 l3kernel/l3msg.dtx                                 |    2 +-
 l3kernel/l3oldmodules.dtx                          |    2 +-
 l3kernel/l3prg.dtx                                 |    4 +-
 l3kernel/l3skip.dtx                                |    4 +-
 l3kernel/l3str.dtx                                 |    8 +-
 l3kernel/l3tl.dtx                                  |    2 +-
 l3kernel/l3unicode-data.dtx                        |   18 ++--
 l3kernel/testfiles/d3dvipdfmx.lvt                  |    2 +-
 l3kernel/testfiles/d3dvips.lvt                     |    2 +-
 l3kernel/testfiles/d3pdfmode.lvt                   |    2 +-
 l3kernel/testfiles/d3xdvipdfmx.lvt                 |    2 +-
 l3kernel/testfiles/driver.tex                      |    6 +-
 l3kernel/testfiles/m3char001.lvt                   |    2 +-
 l3kernel/testfiles/m3clist002.lvt                  |    2 +-
 l3kernel/testfiles/m3clist004.lvt                  |    4 +-
 l3kernel/testfiles/m3clist005.lvt                  |    2 +-
 l3kernel/testfiles/m3coffins001.lvt                |    4 +-
 l3kernel/testfiles/m3fp-basics003.lvt              |    2 +-
 l3kernel/testfiles/m3fp-basics004.lvt              |    2 +-
 l3kernel/testfiles/m3fp-basics005.lvt              |    2 +-
 l3kernel/testfiles/m3fp-expo001.lvt                |    2 +-
 l3kernel/testfiles/m3fp-func001.lvt                |    2 +-
 l3kernel/testfiles/m3fp-logic002.lvt               |    2 +-
 l3kernel/testfiles/m3fp-logic003.lvt               |    2 +-
 l3kernel/testfiles/m3fp-parse001.lvt               |    2 +-
 l3kernel/testfiles/m3fp-parse002.lvt               |    2 +-
 l3kernel/testfiles/m3fp-traps001.lvt               |    2 +-
 l3kernel/testfiles/m3fp-trig001.lvt                |    2 +-
 l3kernel/testfiles/m3fp-trig002.lvt                |    2 +-
 l3kernel/testfiles/m3fp-trig003.lvt                |    2 +-
 l3kernel/testfiles/m3fp-trig004.lvt                |    2 +-
 l3kernel/testfiles/m3int001.lvt                    |    4 +-
 l3kernel/testfiles/m3ior002.lvt                    |    2 +-
 l3kernel/testfiles/m3keys001.lvt                   |   12 +--
 l3kernel/testfiles/m3keys002.lvt                   |   28 +++---
 l3kernel/testfiles/m3keys003.lvt                   |   18 ++--
 l3kernel/testfiles/m3keys004.lvt                   |   22 ++---
 l3kernel/testfiles/m3keys005.lvt                   |    8 +-
 l3kernel/testfiles/m3prop003.lvt                   |    2 +-
 l3kernel/testfiles/m3seq005.lvt                    |    2 +-
 l3kernel/testfiles/m3seq006.lvt                    |   16 ++--
 l3kernel/testfiles/m3skip003.lvt                   |    4 +-
 l3kernel/testfiles/m3str001.lvt                    |    2 +-
 l3kernel/testfiles/m3tl006.lvt                     |    2 +-
 l3kernel/testfiles/m3tl007.lvt                     |    2 +-
 l3kernel/testfiles/m3tl010.lvt                     |    2 +-
 l3kernel/testfiles/m3tl011.lvt                     |   18 ++--
 l3kernel/testfiles/m3tl012.lvt                     |    2 +-
 l3kernel/testfiles/m3tl013.lvt                     |   14 +--
 l3kernel/testfiles/m3token005.lvt                  |    2 +-
 l3kernel/testfiles/support/driver.tex              |    6 +-
 l3packages/xparse/build.lua                        |    2 +-
 l3packages/xparse/testfiles/xparse001.lvt          |    2 +-
 l3packages/xparse/testfiles/xparse004.lvt          |    2 +-
 l3packages/xtemplate/testfiles/xtemplate005.lvt    |   16 ++--
 l3trial/l3auxdata/l3auxdata.dtx                    |   76 ++++++++--------
 l3trial/l3bigint/l3bigint.dtx                      |    2 +-
 l3trial/l3check/build.lua                          |    2 +-
 l3trial/l3check/l3check.dtx                        |    2 +-
 l3trial/l3fp-extras/build.lua                      |    2 +-
 .../l3fp-extras/testfiles/m3fp-functions001.lvt    |    2 +-
 l3trial/l3fp-extras/testfiles/m3fp-symbolic001.lvt |    2 +-
 l3trial/l3hooks/build.lua                          |    2 +-
 l3trial/l3htoks/build.lua                          |    2 +-
 l3trial/l3kernel-extras/build.lua                  |    2 +-
 l3trial/l3ldb/build.lua                            |    2 +-
 l3trial/l3ldb/testfiles/m3ldb003.lvt               |    2 +-
 l3trial/l3rand/build.lua                           |    2 +-
 l3trial/l3str-format-new/build.lua                 |    2 +-
 l3trial/xbox/testfiles/xbox001.lvt                 |    2 +-
 l3trial/xbox/testfiles/xbox002.lvt                 |   12 +--
 l3trial/xbox/xbox.dtx                              |    2 +-
 l3trial/xfont/README.md                            |    2 +-
 l3trial/xfont/build.lua                            |    2 +-
 l3trial/xfont/testfiles/l3font001.lvt              |    2 +-
 news/l3news08.tex                                  |    4 +-
 news/l3news09.tex                                  |    8 +-
 support/docstrip.tex                               |   16 ++--
 xpackages/xor/testfiles/xor001.lvt                 |   56 ++++++------
 xpackages/xor/xmarks.dtx                           |   34 +++----
 xpackages/xor/xo-balance.tex                       |   12 +--
 xpackages/xor/xo-capt.dtx                          |    2 +-
 xpackages/xor/xo-final.dtx                         |   10 +-
 xpackages/xor/xo-float.dtx                         |   32 +++----
 xpackages/xor/xo-footnote.dtx                      |   64 ++++++-------
 xpackages/xor/xo-here.dtx                          |    8 +-
 xpackages/xor/xo-new.dtx                           |   96 ++++++++++----------
 xpackages/xor/xo-or.dtx                            |   66 +++++++-------
 xpackages/xor/xo-page.dtx                          |   28 +++---
 xpackages/xor/xo-pagestyle.dtx                     |   92 +++++++++----------
 xpackages/xor/xo-pfloat.tex                        |   60 ++++++------
 xpackages/xor/xo-place.dtx                         |   90 +++++++++---------
 xpackages/xor/xotrace.ins                          |    4 +-
 xpackages/xor/xoutput.tex                          |    2 +-
 115 files changed, 619 insertions(+), 619 deletions(-)

diff --git a/README.md b/README.md
index d07e40c..63ed999 100644
--- a/README.md
+++ b/README.md
@@ -109,4 +109,4 @@ the [LaTeX-L list](#Discussion) should be used.
 
 <p>Copyright (C) 2011,2012,2014,2015 The LaTeX3 Project <br />
 <a href="http://latex-project.org/">http://latex-project.org/</a> <br />
-All rights reserved.</p>
\ No newline at end of file
+All rights reserved.</p>
diff --git a/articles/lua-test-suite.tex b/articles/lua-test-suite.tex
index d0e3b9f..ed87737 100644
--- a/articles/lua-test-suite.tex
+++ b/articles/lua-test-suite.tex
@@ -106,7 +106,7 @@ verify them against the current \LaTeX\,2.09
 implementation. Figure~\ref{fig:volunteers} shows the original request
 for volunteers (exhibiting a severe underestimation of the amount of
 work involved); see also \cite{Mittelbach:TB18-4-309} for a more extensive
-description of this endeavor. 
+description of this endeavor.
 
 This effort resulted in something like 200 test files
 that were then used to assure ourselves that the new \LaTeXe{}
@@ -145,7 +145,7 @@ Estimated time required: 2 to 3 weeks, could be divided~up.
 Once in place this regression test suite was augmented over time and
 now contains roughly 350 test files altogether. Whenever a bug was
 found and fixed we added a new test file that would exhibit the undesired behavior
-if that bug would somehow resurface through later changes. 
+if that bug would somehow resurface through later changes.
 
 Though not
 perfect (after all we introduced a number of bugs that initially were
@@ -160,7 +160,7 @@ problems. First of all we wanted to be confident that the code and the
 documented user interfaces worked as expected. Whenever we recoded
 an internal function the test suite would automatically alert us if that
 resulted in any noticeable changes at the user level or in downright
-bugs. 
+bugs.
 
 Furthermore \LaTeXe{} came with much more documentation and the
 tests included compiling and checking the documentation files for
@@ -382,7 +382,7 @@ and the actual test body.  \cs{TESTEXP} executes the body within a
 \cs{TYPE} command to test expandability but with \cs{TEST} you are
 responsible for generating test output using \cs{TYPE}, \cs{TRUE},
 etc.\ as it is intended to be used for non-expandable tests.
-Both  commands  surround the generated output with \cs{SEPARATOR}s and 
+Both  commands  surround the generated output with \cs{SEPARATOR}s and
 display the title and a test number. Here is an example:
 \begin{Verbatim}
 \begin{TEST}{stepping counters}
@@ -447,12 +447,12 @@ tests.  This is performed with:
 many times as necessary until the test file demonstrates the necessary
 behaviour being tested.
 %
-At this point, 
+At this point,
 \begin{quote}\ttfamily
 \execname~check~\meta{test name}
 \end{quote}
 will then re-run the \texttt{.lvt} file and compare the result to the
-original \texttt{.tlg} output.  
+original \texttt{.tlg} output.
 If no \meta{test name} is specified all tests in the test directory are run. Presuming no code has changed to
 affect the output of the tests, the console output of this task will show the name of the test files being processed followed by the line:
 \begin{quote}\ttfamily
@@ -494,7 +494,7 @@ file and it will work on different installations.
  -- call standard script
 
  kpse.set_program_name ("kpsewhich")
- dofile (kpse.lookup ("l3build.lua")) 
+ dofile (kpse.lookup ("l3build.lua"))
 \end{Verbatim}
 \caption{Driver file for a hypothetical \textsf{abc} package}
 \label{fig:driver}
@@ -762,7 +762,7 @@ So here is the list of available tasks:
 \item[\texttt{save} \meta{name} \meta{engine}] This generates (or
   regenerates) the \texttt{.tlg} file for \meta{name}. If additionally
   supplied an \meta{engine} argument it generates a specific
-  \texttt{.tlg} as discussed above. 
+  \texttt{.tlg} as discussed above.
 
   It is the responsibility of the developer to verify that the data
   placed into the \texttt{.tlg} produces the desired result, i.e., is
diff --git a/l3build/README.md b/l3build/README.md
index 0c9d169..339af3c 100644
--- a/l3build/README.md
+++ b/l3build/README.md
@@ -6,7 +6,7 @@ high-quality LaTeX code by providing:
  - A unit testing system
  - Automated typesetting of code sources
  - A reliable packaging system for CTAN releases
- 
+
 The bundle consists of a Lua script to run the tasks and a
 `.tex` file which provides the testing environment. These were
 originally developed for supporting LaTeX3 development but
diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 8347b39..c42fa1d 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -106,7 +106,7 @@
 \luavarset{installfiles}    {\{"*.sty"\}}         {Files to install to the \TeX{} tree and similar tasks.}
 \luavarset{makeindexfiles}  {\{"*.ist"\}}{MakeIndex files to be included in a TDS-style zip}
 \luavarset{sourcefiles}     {\{"*.dtx", "*.ins"\}}{Files to copy for unpacking.}
-\luavarset{textfiles}       {\{"*.md", "*.txt"\}}{Plain text files to send to CTAN as-is.}    
+\luavarset{textfiles}       {\{"*.md", "*.txt"\}}{Plain text files to send to CTAN as-is.}
 \luavarset{typesetfiles}    {\{"*.dtx"\}} {Files to typeset for documentation.}
 \luavarset{typesetsuppfiles}{\{~\}}       {Files needed to support typesetting when \enquote{sandboxed}.}
 \luavarset{unpackfiles}     {\{"*.ins"\}} {Files to run to perform unpacking.}
@@ -272,7 +272,7 @@
 %              yyy.ins                 zoo.ins
 % \end{Verbatim}
 % All modules within a bundle must use the same build script name.
-% 
+%
 % In a small number of cases, the name used by CTAN for a module or bundle is
 % different from that used in the installation tree. For example, the \LaTeXe{}
 % kernel is called \pkg{latex-base} by CTAN but is located inside
@@ -308,7 +308,7 @@
 % \item save \meta{name(s)}
 % \end{itemize}
 % These commands are described below.
-% 
+%
 % As well as these commands, the system recognises the options
 % \begin{itemize}
 % \item \texttt{--engine} (\texttt{-e}) Sets the engine to use for
@@ -351,7 +351,7 @@
 % More detail on this in the documentation on |save|.
 % Options passed to the binary are defined in the variable \var{checkopts}.
 %
-% By default, |texmf| trees are searched for input files when checking. This can be disabled by setting \var{checksearch} to |false|: isolation provides confidence that the tests cannot accidentally be running with incorrect files installed in the main distribution or |hometexmf|. 
+% By default, |texmf| trees are searched for input files when checking. This can be disabled by setting \var{checksearch} to |false|: isolation provides confidence that the tests cannot accidentally be running with incorrect files installed in the main distribution or |hometexmf|.
 % \end{buildcmd}
 %
 %
@@ -411,7 +411,7 @@
 % \begin{itemize}
 % \item all files matched by \var{demofiles},
 % \item all files matched by \var{docfiles},
-% \item all files matched by \var{typesetfiles} with their extension replaced with |.pdf|, 
+% \item all files matched by \var{typesetfiles} with their extension replaced with |.pdf|,
 % \item all files matched by \var{textfiles},
 % \item all files matched by \var{bibfiles}.
 % \end{itemize}
@@ -421,7 +421,7 @@
 % Files that should always be excluded from the archive are matched against the \var{excludefiles} variable; by default this is \luavar{excludefiles}, which match Emacs' autosave files.
 %
 % Binary files should be specified with the \var{binaryfiles} variable (default \luavar{binaryfiles}); these are added to the zip archive without normalising line endings (text files are automatically converted to Unix-style line endings).
-% 
+%
 % To create the archive, by default the binary \var{zipexe} is used (\luavar{zipexe}) with options \var{zipopts} (|-v -r -X|). The intermediate build directories \var{ctandir} and \var{tdsdir} are used to construct the archive.
 % \end{buildcmd}
 %
@@ -633,9 +633,9 @@
 %     years due to a \TeX{} bug).
 %   \item Conversion of \texttt{on line \meta{number}} to \texttt{on line ...}
 %     to allow flexibility in changes to test files.
-%   \item 
+%   \item
 % \end{itemize}
-% 
+%
 % \LuaTeX{} makes several additional changes to the log file. As normalising
 % these may not be desirable in all cases, they are handled separately.
 % When creating \LuaTeX{}-specific test files (either with \LuaTeX{} as
@@ -698,7 +698,7 @@
 % (See the \var{checkruns} variable for how these tests would be test up.)
 %
 % \subsection{Commands to help write tests}
-% 
+%
 % A simple command \cs{CHECKCOMMAND}\cs{\meta{macro}} is provided to check whether a particular \cs{\meta{macro}} is defined, undefined, or equivalent to \cs{relax}.
 % This is useful to flag either that internal macros are remaining local to their definitions, or that defined commands definitely are defined, or even as a reminder that commands you intend to define in a future package need to be tested once they appear.
 %
@@ -944,7 +944,7 @@
 % For example,  Figure~\ref{fig:PDF} shows a simple script which might
 % apply to a case where multiple \BibTeX{} runs are needed (perhaps where
 % citations can appear within other references).
-% 
+%
 % \begin{figure}[!b]
 %   \begin{lstlisting}[frame=single,language={[5.2]Lua},gobble = 6]
 %     #!/usr/bin/env texlua
@@ -964,7 +964,7 @@
 %           bibtex (name) +
 %           tex (file)    +
 %           tex (file)
-%         )  
+%         )
 %       end
 %       return errorlevel
 %     end
@@ -1014,7 +1014,7 @@
 \showboxdepth=\maxdimen
 %    \end{macrocode}
 %
-% The |\showoutput| command of \LaTeX{} calls |\loggingoutput| which in 
+% The |\showoutput| command of \LaTeX{} calls |\loggingoutput| which in
 % turn calls |\errorstopmode| but we want to continue running without
 % any stops.
 %    \begin{macrocode}
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 7f560e3..e7a4fe3 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -494,13 +494,13 @@ function relpath(target, source)
   local resultdir = ""
   local trimpattern = "^[^/]*/"
   -- Trim off identical leading directories
-  while 
+  while
     (string.match(target, trimpattern) or "X") ==
     (string.match(target, trimpattern) or "Y") do
     target = string.gsub(target, trimpattern, "")
     source = string.gsub(source, trimpattern, "")
   end
-  -- Go up from the source 
+  -- Go up from the source
   for i = 0, select(2, string.gsub(target, "/", "")) do
     resultdir = resultdir .. "../"
   end
@@ -956,7 +956,7 @@ function runcheck(name, hide)
       errlevel = os.execute(
         os_diffexe .. " " .. luatlgfile .. " " .. newfile
           .. " > " .. difffile
-      )      
+      )
     else
       errlevel = os.execute(
         os_diffexe .. " " .. tlgfile .. " " .. newfile .. " > " .. difffile
@@ -1020,7 +1020,7 @@ function runtest(name, engine, hide, ext)
         -- avoids any paths in the logs
         os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "")
           .. os_concat ..
-        realengine ..  format .. " " 
+        realengine ..  format .. " "
           .. checkopts .. " " .. asciiopt .. lvtfile
           .. (hide and (" > " .. os_null) or "")
       )
@@ -1065,7 +1065,7 @@ function runtool(envvar, command)
         .. relpath(localdir, typesetdir)
         .. (typesetsearch and os_pathsep or "") ..
       os_concat ..
-      command         
+      command
     )
   )
 end
@@ -1105,7 +1105,7 @@ function bibtex(name)
           os_setenv .. " BSTINPUTS=." .. os_pathsep
             .. relpath(localdir, typesetdir)
             .. (typesetsearch and os_pathsep or "") ..
-          os_concat .. 
+          os_concat ..
           bibtexexe .. " " .. bibtexopts .. " " .. name
         )
       )
@@ -1236,7 +1236,7 @@ function check(names)
       local errlevel = runcheck(name, hide)
       -- Return value must be 1 not errlevel
       if errlevel ~= 0 then
-        if opthalt then 
+        if opthalt then
           return 1
         else
           errorlevel = 1
@@ -1303,7 +1303,7 @@ function cmdcheck()
         os_setenv .. " TEXINPUTS=." .. os_pathsep .. localdir
           .. os_pathsep ..
         os_concat ..
-        engine .. " " .. cmdchkopts .. 
+        engine .. " " .. cmdchkopts ..
           " \"\\PassOptionsToClass{check}{l3doc} \\input " .. j .. "\""
           .. " > " .. os_null
       )
@@ -1334,11 +1334,11 @@ function ctan(standalone)
     -- First, zip up all of the text files
     run(
         dir,
-        zipexe .. " " .. zipopts .. " -ll ".. zipname .. " " .. "." 
-          .. ( 
+        zipexe .. " " .. zipopts .. " -ll ".. zipname .. " " .. "."
+          .. (
             (binfiles or  exclude) and (" -x" .. binfiles .. " " .. exclude)
             or ""
-          )  
+          )
       )
     -- Then add the binary ones
     run(
@@ -1463,7 +1463,7 @@ function doc(files)
         local errorlevel = typesetpdf(j)
         if errorlevel ~= 0 then
           return errorlevel
-        end  
+        end
       end
     end
   end
@@ -1555,7 +1555,7 @@ bundleunpack = bundleunpack or function(sourcedir)
         os_setenv .. " TEXINPUTS=." .. os_pathsep
           .. localdir .. (unpacksearch and os_pathsep or "") ..
         os_concat ..
-        unpackexe .. " " .. unpackopts .. " " .. j .. " < " 
+        unpackexe .. " " .. unpackopts .. " " .. j .. " < "
           .. localdir .. "/yes"
       )
     end
diff --git a/l3build/testfiles-plain/plain-pdftex.lvt b/l3build/testfiles-plain/plain-pdftex.lvt
index b59cdc8..6e9b3cf 100644
--- a/l3build/testfiles-plain/plain-pdftex.lvt
+++ b/l3build/testfiles-plain/plain-pdftex.lvt
@@ -18,4 +18,4 @@
   \show\y
 }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3build/testfiles/00-test-1.lvt b/l3build/testfiles/00-test-1.lvt
index dc46bec..4738e43 100644
--- a/l3build/testfiles/00-test-1.lvt
+++ b/l3build/testfiles/00-test-1.lvt
@@ -19,4 +19,4 @@
   \show\y
 }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3experimental/l3sort/testfiles/m3sort001.lvt b/l3experimental/l3sort/testfiles/m3sort001.lvt
index d6f562d..cb5e553 100644
--- a/l3experimental/l3sort/testfiles/m3sort001.lvt
+++ b/l3experimental/l3sort/testfiles/m3sort001.lvt
@@ -105,4 +105,4 @@
       { \ERROR }
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3experimental/l3sort/testfiles/m3sort002.lvt b/l3experimental/l3sort/testfiles/m3sort002.lvt
index 9e38ce8..1e24964 100644
--- a/l3experimental/l3sort/testfiles/m3sort002.lvt
+++ b/l3experimental/l3sort/testfiles/m3sort002.lvt
@@ -50,4 +50,4 @@
   { \exp_args:No \tl_sort:nN \l_tmpa_tl \test_compare:nnTF }
 
 
-\END
\ No newline at end of file
+\END
diff --git a/l3experimental/l3str/testfiles/m3regex010.lvt b/l3experimental/l3str/testfiles/m3regex010.lvt
index d332b32..66879da 100644
--- a/l3experimental/l3str/testfiles/m3regex010.lvt
+++ b/l3experimental/l3str/testfiles/m3regex010.lvt
@@ -20,4 +20,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3experimental/l3str/testfiles/m3tl-analysis001.lvt b/l3experimental/l3str/testfiles/m3tl-analysis001.lvt
index f1b7d1b..bd65786 100644
--- a/l3experimental/l3str/testfiles/m3tl-analysis001.lvt
+++ b/l3experimental/l3str/testfiles/m3tl-analysis001.lvt
@@ -42,7 +42,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \OMIT
 \char_set_active_eq:NN [ { % } ] { [
-\char_set_active_eq:NN ] } 
+\char_set_active_eq:NN ] }
 \char_set_catcode_active:N \[
 \char_set_catcode_active:N \]
 \TIMO
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index ad51fcd..c8d6610 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -735,7 +735,7 @@
 %
 % Settings for application by the galley respect the usual \TeX{} grouping and
 % so are all local variables.
-% 
+%
 % \begin{variable}
 %   {\l_@@_cutout_left_indent_seq, \l_@@_cutout_right_indent_seq}
 %   Essentially scratch space, used when setting up a cutout in a paragrph,
@@ -1183,7 +1183,7 @@
 %   operation. Once the paragraph has been typeset, the number of lines is
 %   added to the running total. It's possible that the conceptual paragraph
 %   contains display-like material, and simply setting the number of lines
-%   equal to \cs{tex_prevgraf:D} would lose these. 
+%   equal to \cs{tex_prevgraf:D} would lose these.
 %    \begin{macrocode}
       {
         \g_galley_par_end_hook_tl
@@ -1772,7 +1772,7 @@
 % \end{macro}
 %
 % \subsection{Setting the primitive paragraph shape}
-% 
+%
 % \begin{macro}[int]{\@@_parshape_set:}
 % \begin{macro}[aux]
 %   {
@@ -1814,7 +1814,7 @@
 %   Setting the margins is simple. Either they are zero, using the full measure,
 %   or they are not. This is always set even if there are other elements to
 %   apply as these settings are very fast, so it is not worth doing a check
-%   at this stage for further parts to apply. 
+%   at this stage for further parts to apply.
 %    \begin{macrocode}
 \cs_new_protected_nopar:Npn \@@_parshape_set_margins:
   {
@@ -1945,7 +1945,7 @@
   }
 %    \end{macrocode}
 %   Grab the last entry of the shorter sequence and repeat it to match
-%   the length of the longer. 
+%   the length of the longer.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_parshape_set_cutouts:N #1
   {
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index e23edda..5b22d1d 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -994,7 +994,7 @@
 % \end{itemize}
 % Any engine which defines |\pdfoutput| (\emph{i.e.}~allows direct production
 % of a PDF file without a DVI intermediate) must also provide |\pdfliteral|.
-% 
+%
 % Practically, these requirements are met by the engines
 % \begin{itemize}
 %    \item \pdfTeX{} v1.30 or later.
@@ -1004,7 +1004,7 @@
 % \end{itemize}
 % of which the first three engines are currently officially supported by
 % the team.
-% 
+%
 % Additional modules beyond the core of \pkg{expl3} may require additional
 % primitives. In particular, third-party authors may significantly
 % extend the primitive coverage requirements.
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index cdce458..797d97f 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -2119,7 +2119,7 @@
 %   for the boolean.  For example,
 %   |\__cs_split_function:NN \foo_bar:cnx \use_i:nnn| as input
 %   becomes |\use_i:nnn {foo_bar} {cnx} \c_true_bool|.
-%   
+%
 %   We cannot use |:| directly as it has the wrong category code so
 %   an |x|-type expansion is used to force the conversion.
 %
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index 944c9fa..a42afb4 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -318,11 +318,11 @@
           end
         end
       end
-      tex.enableprimitives("", t)      
+      tex.enableprimitives("", t)
     }%
   \fi
 \endgroup
-%</package> 
+%</package>
 %    \end{macrocode}
 %
 % \subsection{The \tn{pdfstrcmp} primitive with \XeTeX{} and \LuaTeX{}}
@@ -403,7 +403,7 @@
 % is required. That is set up here, following the model above. Note that
 % we do not try to emulate the syntax of the primitive (doable with \LuaTeX{}
 % 0.80 or later, but not required by our use case).
-% 
+%
 % One minor wrinkle is that a catcode table is needed to return values.
 % For format mode, long-term we can simply take an arbitrary one and make
 % sure this is never allocated. In package mode use the same approach
@@ -524,7 +524,7 @@
           \endgroup
           \noexpand\endinput
         }%
-%</package>    
+%</package>
   \fi
 \next
 %    \end{macrocode}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index 9e6ccd7..9938929 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1255,7 +1255,7 @@ Do not distribute a modified version of this file.
   }
 %    \end{macrocode}
 %
-% \begin{macro}{\eTeX, \IniTeX, \Lua, \LuaTeX, \pdfTeX, \XeTeX, 
+% \begin{macro}{\eTeX, \IniTeX, \Lua, \LuaTeX, \pdfTeX, \XeTeX,
 %   \pTeX, \upTeX, \epTeX, \eupTeX}
 %   Some commands for logos.
 %    \begin{macrocode}
diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index 5aa79e4..398efab 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -240,7 +240,7 @@
 % \begin{verbatim}
 %    \tl_set:No \l_tmpa_tl { { \l_tmpa_tl } }
 % \end{verbatim}
-% and 
+% and
 % \begin{verbatim}
 %    \tl_set:Nf \l_tmpa_tl { { \l_tmpa_tl } }
 % \end{verbatim}
@@ -650,7 +650,7 @@
 % \begin{function}[added=2015-08-23,EXP]
 %       {
 %         \exp:w ,
-%         \exp_end: 
+%         \exp_end:
 %       }
 %   \begin{syntax}
 %     \cs{exp:w} \meta{expandable-tokens} \cs{exp_end:} \\
@@ -680,7 +680,7 @@
 % \begin{function}[added=2015-08-23,EXP]
 %       {
 %         \exp:w ,
-%         \exp_end_continue_f:w 
+%         \exp_end_continue_f:w
 %       }
 %   \begin{syntax}
 %     \cs{exp:w} \meta{expandable-tokens} \cs{exp_end_continue_f:w} \meta{further-tokens}
@@ -700,7 +700,7 @@
 %
 %
 %   In typical use cases  \meta{expandable-tokens} contains no tokens at all,
-%   e.g., you will see code such as 
+%   e.g., you will see code such as
 %\begin{verbatim}
 %    \exp_after:wN { \exp:w \exp_end_continue_f:w #2 }
 %\end{verbatim}
@@ -732,7 +732,7 @@
 % \begin{function}[added=2015-08-23,EXP]
 %       {
 %         \exp:w ,
-%         \exp_end_continue_f:nw 
+%         \exp_end_continue_f:nw
 %       }
 %   \begin{syntax}
 %     \cs{exp:w} \meta{expandable-tokens} \cs{exp_end_continue_f:nw} \meta{further-tokens}
@@ -886,12 +886,12 @@
 % \begin{macro}[int, EXP]{\::f}
 % \begin{macro}{\exp_stop_f:}
 %   This function is used to expand a token list until the first
-%   unexpandable token is found. This is achieved through \cs{exp:w} 
+%   unexpandable token is found. This is achieved through \cs{exp:w}
 %   \cs{exp_end_continue_f:w} that
 %   expands everything in its way following it. This
 %   scanning procedure is terminated once the expansion hits
 %   something non-expandable or a space. We introduce \cs{exp_stop_f:}
-%   to mark such an end of expansion marker. 
+%   to mark such an end of expansion marker.
 %   In the example shown earlier the scanning was stopped
 %   once \TeX{} had fully expanded |\cs_set_eq:Nc \aaa { b \l_tmpa_tl b }|
 %   into |\cs_set_eq:NN \aaa = \blurb| which then turned out to contain
@@ -1460,7 +1460,7 @@
 %    \begin{macrocode}
 \cs_new:Npn ^^@{\expansionERROR}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \cs_new:Npn \exp_end_continue_f:nw #1 { `^^@ #1 }
 \tex_catcode:D `\^^@=15
diff --git a/l3kernel/l3format.ins b/l3kernel/l3format.ins
index 58c1ee5..3d967cc 100644
--- a/l3kernel/l3format.ins
+++ b/l3kernel/l3format.ins
@@ -90,4 +90,4 @@ Do not distribute a modified version of this file.
 
 \generate{\file{l3docstrip.tex}{\from{l3docstrip.dtx}{program}}}
 
-\endbatchfile
\ No newline at end of file
+\endbatchfile
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 83e9140..706cbce 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -527,7 +527,7 @@
                  {
     \exp_not:N     \exp_after:wN ,
     \exp_not:N     \exp_after:wN \c_space_tl
-    \exp_not:N     \exp:w 
+    \exp_not:N     \exp:w
     \exp_not:N     \exp_end_continue_f:w
     \exp_not:N     \@@_to_tl_dispatch:w #1 #2 ;
                  }
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index cc213f8..ea3199e 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -171,7 +171,7 @@
 % discussion, each property is illustrated attached to an
 % arbitrary \meta{key}, which when used may be supplied with a
 % \meta{value}. All key \emph{definitions} are local.
-% 
+%
 % Key properties are applied in the reading order and so the ordering
 % is significant. Key properties which define \enquote{actions}, such
 % as |.code:n|, |.tl_set:N|, \emph{etc.}, will override one another.
@@ -940,7 +940,7 @@
 %   any braces, another \cs{q_nil} needed before the next phase of the
 %   parser. Finally, loop around for the next item, adding in the
 %   \cs{q_nil}: this happens whatever the nature of the current argument
-%   as the end-of-recursion will clear up in all cases.  
+%   as the end-of-recursion will clear up in all cases.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_parse_elt:w #1 ,
   {
@@ -1444,10 +1444,10 @@
 %   Auto-generating choices means setting up the root key as a choice, then
 %   defining each choice in turn.
 %    \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_choices_make:nn 
+\cs_new_protected_nopar:Npn \@@_choices_make:nn
   { \@@_choices_make:Nnn \@@_choice_make: }
-\cs_new_protected_nopar:Npn \@@_multichoices_make:nn 
-  { \@@_choices_make:Nnn \@@_multichoice_make: }  
+\cs_new_protected_nopar:Npn \@@_multichoices_make:nn
+  { \@@_choices_make:Nnn \@@_multichoice_make: }
 \cs_new_protected:Npn \@@_choices_make:Nnn #1#2#3
   {
     #1
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index 5394758..9ffce3c 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -88,7 +88,7 @@
 %   Each \cs{lua_now:n} block is treated by \Lua{} as a separate chunk.
 %   The \Lua{} interpreter will execute the \meta{\Lua{} input} immediately,
 %   and in an expandable manner.
-%   
+%
 %   In the case of the \cs{lua_now_x:n} version the input is fully expanded
 %   by \TeX{} in an \texttt{x}-type manner \emph{but} the function remains
 %   fully expandable.
@@ -112,7 +112,7 @@
 %   The \Lua{} interpreter will execute the \meta{\Lua{} input} during the
 %   page-building routine: no \TeX{} expansion of the \meta{\Lua{} input}
 %   will occur at this stage.
-%   
+%
 %   In the case of the \cs{lua_shipout_x:n} version the input is fully
 %   expanded by \TeX{} in an \texttt{x}-type manner during the shipout
 %   operation.
@@ -130,7 +130,7 @@
 %   \Lua{}: embedded backslashes, double and single quotes, and newlines
 %   and carriage returns are escaped. This is done by prepending an extra
 %   token consisting of a backslash with category code~$12$, and for the line
-%   endings, converting them to |\n| and |\r|, respectively. 
+%   endings, converting them to |\n| and |\r|, respectively.
 %
 %   In the case of the \cs{lua_escape_x:n} version the input is fully expanded
 %   by \TeX{} in an \texttt{x}-type manner \emph{but} the function remains
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 14264a9..e256756 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -788,7 +788,7 @@
 %   the \cs{__msg_show_item:nn} and \cs{__msg_show_item_unbraced:nn} versions
 %   for key--value like data structures.
 % \end{function}
-% 
+%
 % \begin{variable}{\c__msg_coding_error_text_tl}
 %   The text
 %   \begin{verbatim}
diff --git a/l3kernel/l3oldmodules.dtx b/l3kernel/l3oldmodules.dtx
index 4d884f8..98272b0 100644
--- a/l3kernel/l3oldmodules.dtx
+++ b/l3kernel/l3oldmodules.dtx
@@ -122,7 +122,7 @@
 %<l3tl>{l3tl}
 %<l3token>{l3token}
 %    \end{macrocode}
-%    
+%
 %    Then identify the current package:
 %    \begin{macrocode}
 \ProvidesPackage\old at liii@module at name
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index d819b4c..e3b5439 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -238,7 +238,7 @@
 % All conditional |\bool_| functions except assignments are expandable
 % and expect the input to also be fully expandable (which will generally
 % mean being constructed from predicate functions, possibly nested).
-% 
+%
 % \begin{texnote}
 %   The \texttt{bool} data type is not implemented using the
 %   \tn{iffalse}/\tn{iftrue} primitives, in contrast to \tn{newif},
@@ -1569,7 +1569,7 @@
 % \end{macro}
 %
 % \subsection{Deprecated functions}
-% 
+%
 % \begin{macro}[int]{\scan_align_safe_stop:}
 %   Deprecated 2015-08-01 for removal after 2016-12-31.
 %    \begin{macrocode}
diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index 2941e6e..3d9fb7e 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -499,7 +499,7 @@
 %   \end{verbatim}
 %   leaves |0.35277| in the input stream, \emph{i.e.}~the magnitude of
 %   one big point when converted to millimetres.
-%   
+%
 %   Note that this function is not optimised for any particular output
 %   and as such may give different results to \cs{dim_to_decimal_in_bp:n}
 %   or \cs{dim_to_decimal_in_sp:n}. In particular, the latter is able to
@@ -1451,7 +1451,7 @@
   { \dim_to_decimal:n { ( #1 ) * 800 / 803 } }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}[EXP]{\dim_to_decimal_in_sp:n}
 %   Another hard-coded conversion: this one is necessary to avoid things going
 %   off-scale.
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 627c6de..b03b046 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -193,7 +193,7 @@
 %
 % \begin{function}[rEXP, added = 2015-03-01]
 %    {
-%      \str_lower_case:n, \str_lower_case:f, 
+%      \str_lower_case:n, \str_lower_case:f,
 %      \str_upper_case:n, \str_upper_case:f
 %   }
 %   \begin{syntax}
@@ -204,7 +204,7 @@
 %   described for \cs{tl_to_str:n}, and then to the lower or upper
 %   case representation using a one-to-one mapping as described by the
 %   Unicode Consortium file |UnicodeData.txt|.
-%   
+%
 %   These functions are intended for case changing programmatic data in
 %   places where upper/lower case distinctions are meaningful. One example
 %   would be automatically generating a function name from user input where
@@ -226,7 +226,7 @@
 %   would be used to generate a function with an auto-generated name consisting
 %   of the upper case equivalent of the supplied name followed by the lower
 %   case equivalent of the rest of the input.
-%   
+%
 %   These functions should \emph{not} be used for
 %   \begin{itemize}
 %     \item Caseless comparisons: use \cs{str_fold_case:n} for this
@@ -579,7 +579,7 @@
 \cs_generate_variant:Nn \str_upper_case:n { f }
 \cs_new:Npn \__str_change_case:nn #1
   {
-    \exp_after:wN \__str_change_case_aux:nn \exp_after:wN 
+    \exp_after:wN \__str_change_case_aux:nn \exp_after:wN
       { \tl_to_str:n {#1} }
   }
 \cs_new:Npn \__str_change_case_aux:nn #1#2
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 26523ae..bffca70 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -326,7 +326,7 @@
 % These functions allow the rescanning of tokens: re-apply \TeX{}'s
 % tokenization process to apply category codes different from those
 % in force when the tokens were absorbed. Whilst this functionality is
-% supported, it is often preferable to find alternative approaches 
+% supported, it is often preferable to find alternative approaches
 % to achieving outcomes rather than rescanning tokens (for example
 % construction of token lists token-by-token with intervening category
 % code changes).
diff --git a/l3kernel/l3unicode-data.dtx b/l3kernel/l3unicode-data.dtx
index 79959c4..ab1f3c6 100644
--- a/l3kernel/l3unicode-data.dtx
+++ b/l3kernel/l3unicode-data.dtx
@@ -137,7 +137,7 @@
 %    \end{macrocode}
 %
 % \subsection{Setup}
-% 
+%
 % \begin{variable}{\l__unicode_tmp_tl}
 %   Scratch space.
 %    \begin{macrocode}
@@ -281,7 +281,7 @@
 \use:x
   {
     \cs_new_protected:Npn
-      \exp_not:N \__unicode_parse_line:w ##1 - ##2 \tl_to_str:n { .txt } 
+      \exp_not:N \__unicode_parse_line:w ##1 - ##2 \tl_to_str:n { .txt }
   }
     #3 \scan_stop: #4
   {
@@ -340,7 +340,7 @@
 %%
 \__unicode_verb_end:
 %    \end{macrocode}
-%    
+%
 % \begin{macro}[EXP]{\__unicode_zero_fill:N}
 %   A short piece of reusable code for the header.
 %    \begin{macrocode}
@@ -380,8 +380,8 @@
       { l3unicode-data.def } ~
       {
         \int_use:N \tex_year:D /
-        \__unicode_zero_fill:N \tex_month:D / 
-        \__unicode_zero_fill:N \tex_day:D 
+        \__unicode_zero_fill:N \tex_month:D /
+        \__unicode_zero_fill:N \tex_day:D
       } ~
       { -1 } ~
       { L3~Unicode~data }
@@ -691,7 +691,7 @@
 %    \end{macrocode}
 %
 % Saving the data uses a single file, with the two arrays followed by the
-% exceptions. 
+% exceptions.
 %    \begin{macrocode}
 \tl_map_inline:nn { 0123456789 }
   {
@@ -719,7 +719,7 @@
       }
   }
 \clist_map_inline:nn
-  { upper , lower , title } 
+  { upper , lower , title }
   {
     \iow_now:Nx \g__unicode_result_iow
       {
@@ -728,7 +728,7 @@
           {
             c__unicode_
             \str_if_eq:nnTF {#1} { title } { mixed } {#1}
-            _exceptions_tl 
+            _exceptions_tl
           }
          { \exp_not:v { l__unicode_ #1 _ exceptions_tl } }
       }
@@ -921,4 +921,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/l3kernel/testfiles/d3dvipdfmx.lvt b/l3kernel/testfiles/d3dvipdfmx.lvt
index 4b4e53e..b08766d 100644
--- a/l3kernel/testfiles/d3dvipdfmx.lvt
+++ b/l3kernel/testfiles/d3dvipdfmx.lvt
@@ -6,4 +6,4 @@
 
 \RequirePackage[check-declarations,log-functions,driver=dvipdfmx]{expl3}
 
-\input{driver.tex}
\ No newline at end of file
+\input{driver.tex}
diff --git a/l3kernel/testfiles/d3dvips.lvt b/l3kernel/testfiles/d3dvips.lvt
index 8094a13..1191c87 100644
--- a/l3kernel/testfiles/d3dvips.lvt
+++ b/l3kernel/testfiles/d3dvips.lvt
@@ -6,4 +6,4 @@
 
 \RequirePackage[check-declarations,log-functions,driver=dvips]{expl3}
 
-\input{driver.tex}
\ No newline at end of file
+\input{driver.tex}
diff --git a/l3kernel/testfiles/d3pdfmode.lvt b/l3kernel/testfiles/d3pdfmode.lvt
index d7e3827..2fd86c7 100644
--- a/l3kernel/testfiles/d3pdfmode.lvt
+++ b/l3kernel/testfiles/d3pdfmode.lvt
@@ -1,3 +1,3 @@
 \RequirePackage[check-declarations,log-functions,driver=pdfmode]{expl3}
 
-\input{driver.tex}
\ No newline at end of file
+\input{driver.tex}
diff --git a/l3kernel/testfiles/d3xdvipdfmx.lvt b/l3kernel/testfiles/d3xdvipdfmx.lvt
index 8826079..7aa08ac 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.lvt
+++ b/l3kernel/testfiles/d3xdvipdfmx.lvt
@@ -1,3 +1,3 @@
 \RequirePackage[check-declarations,log-functions,driver=xdvipdfmx]{expl3}
 
-\input{driver.tex}
\ No newline at end of file
+\input{driver.tex}
diff --git a/l3kernel/testfiles/driver.tex b/l3kernel/testfiles/driver.tex
index 8627bd3..f6a5477 100644
--- a/l3kernel/testfiles/driver.tex
+++ b/l3kernel/testfiles/driver.tex
@@ -56,7 +56,7 @@
     \box_rotate:Nn \l_tmpa_box { 45 }
     \box_show:N \l_tmpa_box
   }
-  
+
 \TEST { Scale~box }
   {
     \hbox_set:Nn \l_tmpa_box { Hello~world }
@@ -85,7 +85,7 @@
     \box_scale:Nnn \l_tmpa_box { -3 } { -3 }
     \box_show:N \l_tmpa_box
   }
-  
+
 \TEST { Color }
   {
     \OMIT
@@ -95,4 +95,4 @@
     \box_show:N \l_tmpa_coffin
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3char001.lvt b/l3kernel/testfiles/m3char001.lvt
index 3c41126..f1ce2f9 100644
--- a/l3kernel/testfiles/m3char001.lvt
+++ b/l3kernel/testfiles/m3char001.lvt
@@ -125,4 +125,4 @@
     \test:nn { 1234 } { 12 }
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3clist002.lvt b/l3kernel/testfiles/m3clist002.lvt
index 650b876..2fedede 100644
--- a/l3kernel/testfiles/m3clist002.lvt
+++ b/l3kernel/testfiles/m3clist002.lvt
@@ -294,7 +294,7 @@
     \tl_log:N \l_tmpa_tl
   }
   \tl_log:N \l_tmpa_tl
-  
+
   \clist_put_left:Nn \l_tmpa_clist {b\par}
   \clist_get:NN      \l_tmpa_clist \l_tmpa_tl
   \tl_log:N \l_tmpa_tl
diff --git a/l3kernel/testfiles/m3clist004.lvt b/l3kernel/testfiles/m3clist004.lvt
index b894b1d..b52fd42 100644
--- a/l3kernel/testfiles/m3clist004.lvt
+++ b/l3kernel/testfiles/m3clist004.lvt
@@ -31,7 +31,7 @@
     \clist_get:NNTF \l_tmpa_clist \l_tmpa_tl \TRUE \FALSE
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { branching~pop }
   {
     \clist_pop:NNTF \l_tmpa_clist \l_tmpa_tl \TRUE \FALSE
@@ -52,7 +52,7 @@
     \clist_pop:NNTF \l_tmpa_clist \l_tmpa_tl \TRUE \FALSE
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { branching~gpop }
   {
     \group_begin:
diff --git a/l3kernel/testfiles/m3clist005.lvt b/l3kernel/testfiles/m3clist005.lvt
index 16cfa6c..ffbc6af 100644
--- a/l3kernel/testfiles/m3clist005.lvt
+++ b/l3kernel/testfiles/m3clist005.lvt
@@ -36,7 +36,7 @@
     \clist_set:Nn \l_tmpa_clist { \AA , \g , { (x , y) } }
     \test:f { \clist_use:Nnnn \l_tmpa_clist { ~and~ } { ,~ } { ,~and~ } }
   }
-  
+
 \TEST { clist_use:Nn }
   {
     \clist_clear:N \l_tmpa_clist
diff --git a/l3kernel/testfiles/m3coffins001.lvt b/l3kernel/testfiles/m3coffins001.lvt
index d900cae..3c643ba 100644
--- a/l3kernel/testfiles/m3coffins001.lvt
+++ b/l3kernel/testfiles/m3coffins001.lvt
@@ -106,7 +106,7 @@
     \box_show:N \aaa
     \coffin_show_structure:N \aaa
   }
-  
+
 \TEST { Scaling }
   {
     \hcoffin_set:Nn \aaa { Hello~world }
@@ -117,7 +117,7 @@
     \box_show:N \aaa
     \coffin_show_structure:N \aaa
   }
-  
+
 \TEST { Resizing }
   {
     \hcoffin_set:Nn \aaa { Hello~world }
diff --git a/l3kernel/testfiles/m3fp-basics003.lvt b/l3kernel/testfiles/m3fp-basics003.lvt
index ad969f2..4ffec6c 100644
--- a/l3kernel/testfiles/m3fp-basics003.lvt
+++ b/l3kernel/testfiles/m3fp-basics003.lvt
@@ -88,4 +88,4 @@
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-basics004.lvt b/l3kernel/testfiles/m3fp-basics004.lvt
index 1490472..20cad98 100644
--- a/l3kernel/testfiles/m3fp-basics004.lvt
+++ b/l3kernel/testfiles/m3fp-basics004.lvt
@@ -86,4 +86,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-basics005.lvt b/l3kernel/testfiles/m3fp-basics005.lvt
index f3b0748..867bb40 100644
--- a/l3kernel/testfiles/m3fp-basics005.lvt
+++ b/l3kernel/testfiles/m3fp-basics005.lvt
@@ -35,4 +35,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-expo001.lvt b/l3kernel/testfiles/m3fp-expo001.lvt
index 352414e..eedc9a6 100644
--- a/l3kernel/testfiles/m3fp-expo001.lvt
+++ b/l3kernel/testfiles/m3fp-expo001.lvt
@@ -220,4 +220,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-func001.lvt b/l3kernel/testfiles/m3fp-func001.lvt
index 332265a..b72904a 100644
--- a/l3kernel/testfiles/m3fp-func001.lvt
+++ b/l3kernel/testfiles/m3fp-func001.lvt
@@ -81,4 +81,4 @@
     \fp_to_tl:n { 2 ** \first:w 3 ** 2 } \NEWLINE
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-logic002.lvt b/l3kernel/testfiles/m3fp-logic002.lvt
index 7c6ee6b..a9f4895 100644
--- a/l3kernel/testfiles/m3fp-logic002.lvt
+++ b/l3kernel/testfiles/m3fp-logic002.lvt
@@ -204,4 +204,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-logic003.lvt b/l3kernel/testfiles/m3fp-logic003.lvt
index 91e659b..6fc4a0e 100644
--- a/l3kernel/testfiles/m3fp-logic003.lvt
+++ b/l3kernel/testfiles/m3fp-logic003.lvt
@@ -63,4 +63,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-parse001.lvt b/l3kernel/testfiles/m3fp-parse001.lvt
index 7860637..b69bb42 100644
--- a/l3kernel/testfiles/m3fp-parse001.lvt
+++ b/l3kernel/testfiles/m3fp-parse001.lvt
@@ -123,4 +123,4 @@
     \fp_to_tl:n { 2 / 4 (5 - 1) } \NEWLINE
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-parse002.lvt b/l3kernel/testfiles/m3fp-parse002.lvt
index 78361ee..d8d9a67 100644
--- a/l3kernel/testfiles/m3fp-parse002.lvt
+++ b/l3kernel/testfiles/m3fp-parse002.lvt
@@ -109,4 +109,4 @@
 %   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-traps001.lvt b/l3kernel/testfiles/m3fp-traps001.lvt
index 549691f..44abd8a 100644
--- a/l3kernel/testfiles/m3fp-traps001.lvt
+++ b/l3kernel/testfiles/m3fp-traps001.lvt
@@ -162,4 +162,4 @@
     \fp_if_flag_on:nTF { underflow } { \TRUE } { \ERROR }
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-trig001.lvt b/l3kernel/testfiles/m3fp-trig001.lvt
index 207e432..0f6ab97 100644
--- a/l3kernel/testfiles/m3fp-trig001.lvt
+++ b/l3kernel/testfiles/m3fp-trig001.lvt
@@ -402,4 +402,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-trig002.lvt b/l3kernel/testfiles/m3fp-trig002.lvt
index 600aeb7..82326fe 100644
--- a/l3kernel/testfiles/m3fp-trig002.lvt
+++ b/l3kernel/testfiles/m3fp-trig002.lvt
@@ -444,4 +444,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-trig003.lvt b/l3kernel/testfiles/m3fp-trig003.lvt
index 843ec0e..10975eb 100644
--- a/l3kernel/testfiles/m3fp-trig003.lvt
+++ b/l3kernel/testfiles/m3fp-trig003.lvt
@@ -262,4 +262,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3fp-trig004.lvt b/l3kernel/testfiles/m3fp-trig004.lvt
index 54f5d30..e4a3c93 100644
--- a/l3kernel/testfiles/m3fp-trig004.lvt
+++ b/l3kernel/testfiles/m3fp-trig004.lvt
@@ -444,4 +444,4 @@
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3int001.lvt b/l3kernel/testfiles/m3int001.lvt
index 8231a80..18659d8 100644
--- a/l3kernel/testfiles/m3int001.lvt
+++ b/l3kernel/testfiles/m3int001.lvt
@@ -200,12 +200,12 @@
     \int_to_base:nn { 17 } { 8 }  ~
     \int_from_base:nn { 21 } { 8 }
   }
-  
+
 \TESTEXP{ Case~statements }
   {
     \int_case:nnF
       { -1 + 1 }
-      { 
+      {
         {    -1 } {  \NO }
         { 3 - 3 } { \YES }
       }
diff --git a/l3kernel/testfiles/m3ior002.lvt b/l3kernel/testfiles/m3ior002.lvt
index 9409d5b..68e0195 100644
--- a/l3kernel/testfiles/m3ior002.lvt
+++ b/l3kernel/testfiles/m3ior002.lvt
@@ -67,4 +67,4 @@
     \TYPE { \int_use:N \l_tmpa_int \c_space_tl lines }
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3keys001.lvt b/l3kernel/testfiles/m3keys001.lvt
index c2ea46c..70a0022 100644
--- a/l3kernel/testfiles/m3keys001.lvt
+++ b/l3kernel/testfiles/m3keys001.lvt
@@ -94,7 +94,7 @@
         key-one   , % No value at all
       }
   }
-  
+
 \TEST { .initial:n~and~~variants }
   {
     \keys_define:nn { module }
@@ -162,7 +162,7 @@
       }
     \tl_log:N \l_tmpa_tl
   }
-  
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \TEST { .meta:n }
@@ -178,7 +178,7 @@
         key-two = value-two ,
       }
   }
-  
+
 \TEST { .meta:nn }
   {
     \keys_define:nn { module }
@@ -226,7 +226,7 @@
         key-one  .default:n        = { foo }             ,
         key-two .code:n            = { \TYPE { Hello } } ,
         key-two .value_forbidden:n = true                ,
-        key-two  .default:n        = { foo }             
+        key-two  .default:n        = { foo }
       }
     \keys_set:nn { module }
       {
@@ -274,7 +274,7 @@
         key-two = value
       }
   }
-  
+
 \TEST { Unknown~properties,~etc. }
   {
     \keys_define:nn { module }
@@ -284,7 +284,7 @@
         key-three
       }
   }
-  
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \TEST { Empty~key~name }
diff --git a/l3kernel/testfiles/m3keys002.lvt b/l3kernel/testfiles/m3keys002.lvt
index f777dfa..965f023 100644
--- a/l3kernel/testfiles/m3keys002.lvt
+++ b/l3kernel/testfiles/m3keys002.lvt
@@ -41,7 +41,7 @@
     \bool_log:N \g_tmpa_bool
     \bool_log:N \g_mya_bool
   }
-  
+
 \TEST { .bool_set:c }
   {
     \keys_define:nn { module }
@@ -69,7 +69,7 @@
     \bool_log:N \g_tmpa_bool
     \bool_log:N \g_mya_bool
   }
-  
+
 \TEST { .bool_set_inverse:N }
   {
     \keys_define:nn { module }
@@ -97,7 +97,7 @@
     \bool_log:N \g_tmpa_bool
     \bool_log:N \g_mya_bool
   }
-  
+
 \TEST { .bool_set_inverse:c }
   {
     \keys_define:nn { module }
@@ -125,7 +125,7 @@
     \bool_log:N \g_tmpa_bool
     \bool_log:N \g_mya_bool
   }
-  
+
 \TEST { .clist_set:N }
   {
     \keys_define:nn { module }
@@ -153,7 +153,7 @@
     \clist_log:N \g_tmpa_clist
     \clist_log:N \g_mya_clist
   }
-  
+
 \TEST { .clist_set:c }
   {
     \keys_define:nn { module }
@@ -209,7 +209,7 @@
     \dim_log:N \g_tmpa_dim
     \dim_log:N \g_mya_dim
   }
-  
+
 \TEST { .dim_set:c }
   {
     \keys_define:nn { module }
@@ -237,7 +237,7 @@
     \dim_log:N \g_tmpa_dim
     \dim_log:N \g_mya_dim
   }
-  
+
 \TEST { .fp_set:N }
   {
     \keys_define:nn { module }
@@ -265,7 +265,7 @@
     \fp_log:N \g_tmpa_fp
     \fp_log:N \g_mya_fp
   }
-  
+
 \TEST { .fp_set:c }
   {
     \keys_define:nn { module }
@@ -293,7 +293,7 @@
     \fp_log:N \g_tmpa_fp
     \fp_log:N \g_mya_fp
   }
-  
+
 \TEST { .skip_set:N }
   {
     \keys_define:nn { module }
@@ -321,7 +321,7 @@
     \skip_log:N \g_tmpa_skip
     \skip_log:N \g_mya_skip
   }
-  
+
 \TEST { .skip_set:c }
   {
     \keys_define:nn { module }
@@ -349,7 +349,7 @@
     \skip_log:N \g_tmpa_skip
     \skip_log:N \g_mya_skip
   }
-  
+
 \TEST { .tl_set:N }
   {
     \OMIT
@@ -380,7 +380,7 @@
     \tl_log:N \g_tmpa_tl
     \tl_log:N \g_mya_tl
   }
-  
+
 \TEST { .tl_set:c }
   {
     \OMIT
@@ -411,7 +411,7 @@
     \tl_log:N \g_tmpa_tl
     \tl_log:N \g_mya_tl
   }
-  
+
 \TEST { .tl_set_x:N }
   {
     \OMIT
@@ -476,4 +476,4 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3keys003.lvt b/l3kernel/testfiles/m3keys003.lvt
index 1c0b996..67a33c1 100644
--- a/l3kernel/testfiles/m3keys003.lvt
+++ b/l3kernel/testfiles/m3keys003.lvt
@@ -60,7 +60,7 @@
         key-one = d ,
       }
   }
-  
+
 \TEST { .choices:nn }
   {
     \keys_define:nn { module }
@@ -69,7 +69,7 @@
           { a , b , c }
           {
             \TYPE
-              { \l_keys_choice_tl \c_space_tl  \int_use:N \l_keys_choice_int } 
+              { \l_keys_choice_tl \c_space_tl  \int_use:N \l_keys_choice_int }
           }
       }
     \keys_set:nn { module }
@@ -80,7 +80,7 @@
         key-one     ,
       }
   }
-  
+
 \TEST { .multichoice: }
   {
     \keys_define:nn { module }
@@ -112,7 +112,7 @@
         key-one     ,
       }
   }
-  
+
 \TEST { .multichoices:nn }
   {
     \keys_define:nn { module }
@@ -121,7 +121,7 @@
           { a , b , c }
           {
             \TYPE
-              { \l_keys_choice_tl \c_space_tl  \int_use:N \l_keys_choice_int } 
+              { \l_keys_choice_tl \c_space_tl  \int_use:N \l_keys_choice_int }
           }
       }
     \keys_set:nn { module }
@@ -139,7 +139,7 @@
       }
     \keys_set:nn { module }
       {
-        key-one = a 
+        key-one = a
       }
     \keys_define:nn { module }
       {
@@ -148,8 +148,8 @@
       }
     \keys_set:nn { module }
       {
-        key-one = a 
+        key-one = a
       }
   }
-  
-\END
\ No newline at end of file
+
+\END
diff --git a/l3kernel/testfiles/m3keys004.lvt b/l3kernel/testfiles/m3keys004.lvt
index 0f2ae34..5b93a5a 100644
--- a/l3kernel/testfiles/m3keys004.lvt
+++ b/l3kernel/testfiles/m3keys004.lvt
@@ -37,7 +37,7 @@
       \l_tmpa_tl
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { \keys_set_known:nnN \c_space_tl nesting }
   {
     \keys_define:nn { module }
@@ -76,7 +76,7 @@
     \tl_log:N \l_tmpb_tl
   }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \TEST { \keys_set_filter:nnn }
   {
@@ -177,7 +177,7 @@
       \l_tmpa_tl
     \tl_log:N \l_tmpa_tl
   }
-  
+
 
 \TEST { \keys_set_groups:nnn }
   {
@@ -244,7 +244,7 @@
     \keys_if_exist:nnTF { module } { key-one }   { \TRUE } { \ERROR }  \NEWLINE
     \keys_if_exist:nnTF { module } { key-three } { \ERROR } { \FALSE } \NEWLINE
   }
-  
+
 \OMIT
   \keys_define:nn { module }
     {
@@ -254,7 +254,7 @@
     }
   \tl_set:Nn \l_tmpa_tl { key-one }
   \tl_set:Nn \l_tmpb_tl { a }
-\TIMO 
+\TIMO
 
 \TESTEXP { \keys_if_choice_exist:nnnTF }
   {
@@ -270,7 +270,7 @@
     \keys_if_choice_exist:nnnTF { module } { \l_tmpa_tl } { a }          { \ERROR } { \FALSE } \NEWLINE
     \keys_if_choice_exist:nnnTF { module } { key-one }    { \l_tmpb_tl } { \ERROR } { \FALSE } \NEWLINE
   }
-  
+
 \TEST { \keys_show:nn }
   {
     \keys_define:nn { module }
@@ -278,11 +278,11 @@
         key-one .code:n   = { \TYPE { " #1 " } } ,
         key-two .tl_set:N = \l_tmpa_tl
       }
-    \keys_show:nn { module } { key-one } 
-    \keys_show:nn { module } { key-two } 
-    \keys_show:nn { module } { key-three } 
-    \keys_show:nn { module-a } { key-one } 
+    \keys_show:nn { module } { key-one }
+    \keys_show:nn { module } { key-two }
+    \keys_show:nn { module } { key-three }
+    \keys_show:nn { module-a } { key-one }
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3keys005.lvt b/l3kernel/testfiles/m3keys005.lvt
index e744314..302d003 100644
--- a/l3kernel/testfiles/m3keys005.lvt
+++ b/l3kernel/testfiles/m3keys005.lvt
@@ -20,7 +20,7 @@
       {
         bar / baz .code:n =
           {
-            \tl_log:N \l_keys_key_tl 
+            \tl_log:N \l_keys_key_tl
             \tl_log:N \l_keys_path_tl
           }
       }
@@ -29,7 +29,7 @@
       {
         bar .code:n =
           {
-            \tl_log:N \l_keys_key_tl 
+            \tl_log:N \l_keys_key_tl
             \tl_log:N \l_keys_path_tl
           }
       }
@@ -46,8 +46,8 @@
       }
     \keys_define:nn { moduleB } { test .code:n = \tl_log:n {#1} }
     \keys_set:nn { moduleA / foobar } { test = xxx }
-    \keys_set:nn { moduleA } { foobar / test = xxx } 
+    \keys_set:nn { moduleA } { foobar / test = xxx }
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3prop003.lvt b/l3kernel/testfiles/m3prop003.lvt
index 6723303..9b38097 100644
--- a/l3kernel/testfiles/m3prop003.lvt
+++ b/l3kernel/testfiles/m3prop003.lvt
@@ -140,7 +140,7 @@
         \TYPE { > \tl_to_str:n {#1} --- \tl_to_str:n {#2} < }
       }
   }
-  
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \OMIT
diff --git a/l3kernel/testfiles/m3seq005.lvt b/l3kernel/testfiles/m3seq005.lvt
index 177c608..ec2c07a 100644
--- a/l3kernel/testfiles/m3seq005.lvt
+++ b/l3kernel/testfiles/m3seq005.lvt
@@ -43,4 +43,4 @@
   \test:f { \seq_item:Nn \l_foo_seq {-4} }
 }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3seq006.lvt b/l3kernel/testfiles/m3seq006.lvt
index 377afb6..0529ebe 100644
--- a/l3kernel/testfiles/m3seq006.lvt
+++ b/l3kernel/testfiles/m3seq006.lvt
@@ -31,7 +31,7 @@
     \seq_get:NNTF \l_tmpa_seq \l_tmpa_tl \TRUE \FALSE
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { branching~pop }
   {
     \seq_pop:NNTF \l_tmpa_seq \l_tmpa_tl \TRUE \FALSE
@@ -56,7 +56,7 @@
     \tl_log:N \l_tmpa_tl
     \seq_log:N \l_tmpa_seq
   }
-  
+
 \TEST { branching~gpop }
   {
     \group_begin:
@@ -93,7 +93,7 @@
     \tl_log:N \l_tmpa_tl
     \seq_log:N \g_tmpa_seq
   }
-  
+
 \TEST { branching~get~on~right }
   {
     \seq_get_right:NNTF \l_tmpa_seq \l_tmpa_tl \TRUE \FALSE
@@ -114,7 +114,7 @@
     \seq_get_right:NNTF \l_tmpa_seq \l_tmpa_tl \TRUE \FALSE
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { branching~pop~on~right }
   {
     \seq_pop_right:NNTF \l_tmpa_seq \l_tmpa_tl \TRUE \FALSE
@@ -139,7 +139,7 @@
     \tl_log:N \l_tmpa_tl
     \seq_log:N \l_tmpa_seq
   }
-  
+
 \TEST { branching~gpop~on~right }
   {
     \group_begin:
@@ -176,7 +176,7 @@
     \tl_log:N \l_tmpa_tl
     \seq_log:N \g_tmpa_seq
   }
-  
+
 \TEST { get~on~right }
   {
     \seq_get_right:NN \l_tmpa_seq \l_tmpa_tl
@@ -197,7 +197,7 @@
     \seq_get_right:NN \l_tmpa_seq \l_tmpa_tl
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { pop~on~right }
   {
     \seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
@@ -222,7 +222,7 @@
     \tl_log:N \l_tmpa_tl
     \seq_log:N \l_tmpa_seq
   }
-  
+
 \TEST { gpop~on~right }
   {
     \group_begin:
diff --git a/l3kernel/testfiles/m3skip003.lvt b/l3kernel/testfiles/m3skip003.lvt
index 7fbf5fd..ecd8bcb 100644
--- a/l3kernel/testfiles/m3skip003.lvt
+++ b/l3kernel/testfiles/m3skip003.lvt
@@ -64,11 +64,11 @@
   {
     \dim_case:nnF
       { \l_tmpa_dim }
-      { 
+      {
         { 25.4 mm }     { 25.4 mm }
         { 72.26999 pt } { 72.26999 pt }
         { 72.27 pt }    { 72.27 pt }
-        { \ERROR }      { \ERROR }   
+        { \ERROR }      { \ERROR }
       }
       { \NO }
     \NEWLINE
diff --git a/l3kernel/testfiles/m3str001.lvt b/l3kernel/testfiles/m3str001.lvt
index 55d83f8..59a7e91 100644
--- a/l3kernel/testfiles/m3str001.lvt
+++ b/l3kernel/testfiles/m3str001.lvt
@@ -49,7 +49,7 @@
     \str_if_eq_x:nnF { \l_tmpa_tl } { \g_tmpb_tl  }        { \ERROR } \NEWLINE
     \str_if_eq_x:nnF { # }          { \tl_to_str:n { # } } { \ERROR } \NEWLINE
   }
-  
+
 \TESTEXP { str_if_eq:nnTF }
   {
     \str_if_eq:nnTF { abc }        { abc } { \TRUE }  { \ERROR } \NEWLINE
diff --git a/l3kernel/testfiles/m3tl006.lvt b/l3kernel/testfiles/m3tl006.lvt
index bb8b056..b4e2175 100644
--- a/l3kernel/testfiles/m3tl006.lvt
+++ b/l3kernel/testfiles/m3tl006.lvt
@@ -226,4 +226,4 @@
   \str_if_eq_x:nnF { \str_tail:n { { } }  } { \iow_char:N \} }  ?
 }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3tl007.lvt b/l3kernel/testfiles/m3tl007.lvt
index 1713a4b..6d7e467 100644
--- a/l3kernel/testfiles/m3tl007.lvt
+++ b/l3kernel/testfiles/m3tl007.lvt
@@ -134,4 +134,4 @@
   \test_f:n { \tl_reverse_items:n { a ~ { \b { { } c } D # & \if_false: } } }
 }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3tl010.lvt b/l3kernel/testfiles/m3tl010.lvt
index 404a4a4..38c40b3 100644
--- a/l3kernel/testfiles/m3tl010.lvt
+++ b/l3kernel/testfiles/m3tl010.lvt
@@ -40,4 +40,4 @@
     \tl_log:N \g_B_tl
  }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3tl011.lvt b/l3kernel/testfiles/m3tl011.lvt
index b216e24..06d7354 100644
--- a/l3kernel/testfiles/m3tl011.lvt
+++ b/l3kernel/testfiles/m3tl011.lvt
@@ -15,7 +15,7 @@
   {
     " \tl_head:n { } " \NEWLINE
     " \tl_head:n { ~ } " \NEWLINE
-    " \tl_head:n { ~ { } ~ } " \NEWLINE 
+    " \tl_head:n { ~ { } ~ } " \NEWLINE
     " \tl_head:n { {  } } " \NEWLINE
     " \tl_head:n { { a } } " \NEWLINE
     " \tl_head:n { { a } { b } } " \NEWLINE
@@ -39,12 +39,12 @@
     " \tl_head:n { \iffalse } " \NEWLINE
     " \tl_head:n { \fi } " \NEWLINE
   }
-  
+
 \TESTEXP { Awkward~tails }
   {
     " \tl_tail:n { } " \NEWLINE
     " \tl_tail:n { ~ } " \NEWLINE
-    " \tl_tail:n { ~ { } ~ } " \NEWLINE 
+    " \tl_tail:n { ~ { } ~ } " \NEWLINE
     " \tl_tail:n { {  } } " \NEWLINE
     " \tl_tail:n { { a } } " \NEWLINE
     " \tl_tail:n { { a } { b } } " \NEWLINE
@@ -68,7 +68,7 @@
     " \tl_tail:n { \iffalse } " \NEWLINE
     " \tl_tail:n { \fi } " \NEWLINE
   }
-  
+
 \TEST { f-type~expansion~of~heads }
   {
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { } }
@@ -76,7 +76,7 @@
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { ~ } }
     \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { ~ { } ~ } }
-    \tl_log:N \l_tmpa_tl 
+    \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { {  } } }
     \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { { a } } }
@@ -108,7 +108,7 @@
     \tl_set:Nf \l_tmpa_tl { \tl_head:n { ~ { a } ~ { b } } }
     \tl_log:N \l_tmpa_tl
   }
-  
+
 \TEST { f-type~expansion~of~tails }
   {
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { } }
@@ -116,7 +116,7 @@
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { ~ } }
     \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { ~ { } ~ } }
-    \tl_log:N \l_tmpa_tl 
+    \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { {  } } }
     \tl_log:N \l_tmpa_tl
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { { a } } }
@@ -148,5 +148,5 @@
     \tl_set:Nf \l_tmpa_tl { \tl_tail:n { ~ { a } ~ { b } } }
     \tl_log:N \l_tmpa_tl
   }
- 
-\END
\ No newline at end of file
+
+\END
diff --git a/l3kernel/testfiles/m3tl012.lvt b/l3kernel/testfiles/m3tl012.lvt
index e0f7f08..3d19f1e 100644
--- a/l3kernel/testfiles/m3tl012.lvt
+++ b/l3kernel/testfiles/m3tl012.lvt
@@ -23,4 +23,4 @@
     \tl_log:n z
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3tl013.lvt b/l3kernel/testfiles/m3tl013.lvt
index 8c68859..c9d6ab5 100644
--- a/l3kernel/testfiles/m3tl013.lvt
+++ b/l3kernel/testfiles/m3tl013.lvt
@@ -177,7 +177,7 @@
     \tl_mixed_case:n { Dž! }
     \NEWLINE
   }
-  
+
 \OMIT
   \tl_put_right:Nn \l_tl_case_change_exclude_tl { \emph }
 \TIMO
@@ -197,15 +197,15 @@
 
 \TESTEXP { Expanding~content }
   {
-    \test:n { Some~text~\l_tmpa_tl } 
+    \test:n { Some~text~\l_tmpa_tl }
     \NEWLINE
     \test:n { \l_tmpa_tl \c_space_tl some text }
     \NEWLINE
-    \test:n { Some~text~\l_tmpb_tl } 
+    \test:n { Some~text~\l_tmpb_tl }
     \NEWLINE
     \test:n { \l_tmpb_tl \c_space_tl some text }
     \NEWLINE
-    \test:n { Some~text~\cs_tmp:w } 
+    \test:n { Some~text~\cs_tmp:w }
     \NEWLINE
     \test:n { \cs_tmp:w \c_space_tl some text }
   }
@@ -238,12 +238,12 @@
 \TESTEXP { Math-mode~escape }
   {
     \test:n { Some~text~$y~=~mx~+~c$ }
-    \NEWLINE 
+    \NEWLINE
     \test:n { $y~=~mx~+~c$~text }
     \NEWLINE
     \test:n { Opps~not~close~token~in~$y~=~mx~+~c }
   }
-  
+
 \TESTEXP { Nesting }
   {
     \tl_upper_case:n { \tl_lower_case:n { Hello } }
@@ -254,4 +254,4 @@
     \NEWLINE
    \tl_upper_case:n { \tl_lower_case:n {  ὈΔΥΣΣΕΎΣ } }
   }
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/m3token005.lvt b/l3kernel/testfiles/m3token005.lvt
index 1b84ce3..978ca7f 100644
--- a/l3kernel/testfiles/m3token005.lvt
+++ b/l3kernel/testfiles/m3token005.lvt
@@ -100,4 +100,4 @@
     \l_tmpa_tl
     \test:
   }
-\END
\ No newline at end of file
+\END
diff --git a/l3kernel/testfiles/support/driver.tex b/l3kernel/testfiles/support/driver.tex
index 54e58cc..3e00c53 100644
--- a/l3kernel/testfiles/support/driver.tex
+++ b/l3kernel/testfiles/support/driver.tex
@@ -56,7 +56,7 @@
     \box_rotate:Nn \l_tmpa_box { 45 }
     \box_show:N \l_tmpa_box
   }
-  
+
 \TEST { Scale~box }
   {
     \hbox_set:Nn \l_tmpa_box { Hello~world }
@@ -79,7 +79,7 @@
     \box_scale:Nnn \l_tmpa_box { -3 } { -3 }
     \box_show:N \l_tmpa_box
   }
-  
+
 \TEST { Color }
   {
     \OMIT
@@ -89,4 +89,4 @@
     \box_show:N \l_tmpa_coffin
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3packages/xparse/build.lua b/l3packages/xparse/build.lua
index c404016..9cbdfde 100644
--- a/l3packages/xparse/build.lua
+++ b/l3packages/xparse/build.lua
@@ -15,4 +15,4 @@ maindir = "../.."
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3packages/xparse/testfiles/xparse001.lvt b/l3packages/xparse/testfiles/xparse001.lvt
index 74e48af..21c5d6f 100644
--- a/l3packages/xparse/testfiles/xparse001.lvt
+++ b/l3packages/xparse/testfiles/xparse001.lvt
@@ -324,7 +324,7 @@
            middle
          \end{test}
       }
-    \box_show:N \l_tmpa_box  
+    \box_show:N \l_tmpa_box
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/l3packages/xparse/testfiles/xparse004.lvt b/l3packages/xparse/testfiles/xparse004.lvt
index 7c1d102..9ff29ec 100644
--- a/l3packages/xparse/testfiles/xparse004.lvt
+++ b/l3packages/xparse/testfiles/xparse004.lvt
@@ -92,7 +92,7 @@
     \DeclareDocumentCommand \foo { D { } { } { } } { }
     \cs_show:N \foo
   }
-  
+
 \TEST { Stripping~braces~in~optional~args }
   {
     \DeclareDocumentCommand \foo { o m } { \TYPE { (#1) (#2) }}
diff --git a/l3packages/xtemplate/testfiles/xtemplate005.lvt b/l3packages/xtemplate/testfiles/xtemplate005.lvt
index 9aa97d8..0153089 100644
--- a/l3packages/xtemplate/testfiles/xtemplate005.lvt
+++ b/l3packages/xtemplate/testfiles/xtemplate005.lvt
@@ -34,16 +34,16 @@
       \typeout { \tl_use:N \l_tmpb_tl }
     }
   \DeclareInstance { test } { run } { std } { }
-  
+
 \TIMO
-  
+
 \TEST { Key~values }
   {
     \UseInstance { test } { run }
     \UseInstance { test } { run }
     \UseInstance { test } { run }
   }
-  
+
 \OMIT
 
   \DeclareTemplateCode { test } { std } { 0 }
@@ -59,9 +59,9 @@
       \typeout { \tl_use:N \l_tmpb_tl }
     }
   \DeclareInstance { test } { run } { std } { }
-  
+
 \TIMO
-  
+
 \TEST { Key~values~with~global }
   { \UseInstance { test } { run } }
 
@@ -82,7 +82,7 @@
       \typeout { \bool_if:NTF \l_tmpa_bool { true } { false } }
       \typeout { \bool_if:NTF \l_tmpb_bool { true } { false } }
     }
-  
+
 \TIMO
 
 \TEST { Key~values~for~booleans }
@@ -90,5 +90,5 @@
     \DeclareInstance { test } { run } { std } { }
     \UseInstance { test } { run }
   }
-  
-\END
\ No newline at end of file
+
+\END
diff --git a/l3trial/l3auxdata/l3auxdata.dtx b/l3trial/l3auxdata/l3auxdata.dtx
index a81a119..4179430 100644
--- a/l3trial/l3auxdata/l3auxdata.dtx
+++ b/l3trial/l3auxdata/l3auxdata.dtx
@@ -146,7 +146,7 @@ Therefore, we provide an interface to define which catcode regimes we're expecti
 
   Any changes introduced by this second argument are not constrained to a group and therefore the contents of this argument must be very carefully controlled.
   Catcode changes \emph{must} be implemented with \verb|\char_set_catcode:nn| or similar \pkg{expl3} command to allow for resetting of catcodes once the processing is complete.
-  
+
   One data store only is defined by default: \texttt{doc}, which uses `regular' document catcodes.
   If you wish to use expl3 catcodes, I recommend using the \texttt{expl} label, but this is not defined by default to save write registers.
   Use these if possible rather than creating new data stores.
@@ -157,7 +157,7 @@ Therefore, we provide an interface to define which catcode regimes we're expecti
 (1)~you need to use a different catcode regime; or
 (2)~you are storing so much data that it's slowing everything else down
 (this would be unusual and using a new store will only help so much).
-Always remember that \TeX\ has limited write registers. 
+Always remember that \TeX\ has limited write registers.
 
 
 \begin{function}{\auxdata_new_tag:nn}
@@ -182,7 +182,7 @@ Always remember that \TeX\ has limited write registers.
     \cs{auxdata_process_inline:nn} \Arg{tag} \Arg{inline function}
   \end{syntax}
   Retrieves all data matching <tag> in the data store and applies <inline function> to each matching entry.
-  
+
   Note that this processing stage is not performed inside a group, and therefore can be used in a variety of places such as within tabular environments if necessary.
 \end{function}
 
@@ -190,7 +190,7 @@ Always remember that \TeX\ has limited write registers.
   \begin{syntax}
     \cs{auxdata_split:n} \Arg{basename}
     \cs{auxdata_split_return:}
-  \end{syntax}  
+  \end{syntax}
   Splits the data stores to write into files with specified <basename> to facilitate `partial' document processing such as with \LaTeXe's \cs{include}.
 \end{function}
 
@@ -311,7 +311,7 @@ LOT etc)}
 
 \begin{itemize}
 \item [req 1.1] Maintain order.
-  
+
   Satisfied provided that you don't want to mix tags.
 (See todo item~\ref{merge} on page~\pageref{todo}.)
 
@@ -326,7 +326,7 @@ LOT etc)}
 \item [req 1.4] Data standalone.
 
    All data written to separate tags files, so this is satisfied.
-   
+
 \end{itemize}
 
 
@@ -379,14 +379,14 @@ complexity.
 
    This is the biggest `problem' requirement.
    Since we're checking auxiliary data from within \TeX, we can't get around the fact that having more data leads to problems with either memory requirements or speed or both.
-   
+
    Currently, the solution is to read each tag file as a whole into a single macro, at the beginning and end of the document, and compare them.
    This is hard-limited by an auxiliary file size somewhere north of 20\,MB (400,000 short entries), but hitting that sort of size slows down all the other processing stages significantly as well.
 
 \item [req G.4] Partial compilation.
 
     Partial compilation is supported using the same mechanism as 2e.
-    
+
 \end{itemize}
 
 \section{Implementation notes}
@@ -398,34 +398,34 @@ This is what happens.
   \begin{enumerate}
   \item Code requests a tag to store data with.
   \item Each tag is associated with a `data store' which corresponds to a single file to be written to during the document compilation.
-  
+
   Note that writing multiple tags to a single data store is encouraged to avoid opening too many files.
   \item (Data corresponding to each tag is later written to an auxiliary tag file AtEndDocument.)
   \end{enumerate}
-    
+
   \item AtBeginDocument:
   \begin{enumerate}
   \item \label{enum:cache} Each auxiliary tag file is read in its entirety and its contents stored in a macro.
   \item Note that it is entirely up to the package writer if the data in this tag file is used at this point with additional setup code inserted \cs{AtBeginDocument}.
-  \end{enumerate} 
-  
+  \end{enumerate}
+
   \item During compilation:
   \begin{enumerate}
   \item Data is written with tags to the specified data store file.
   \item When auxiliary data is wished to be processed, the auxiliary tag file is \cs{input} with appropriate definitions for catcodes and its prefix macro.
   \end{enumerate}
-  
+
   \item AtEndDocument
   \begin{enumerate}
   \item All data store files are closed.
-  
+
   \item All data store files are \cs{input} with their tag macros defined to write the contents of each tag to a new auxiliary tag file.
-  
-  If there are enough write registers to do this in a single pass, only one \cs{input} is necessary; otherwise an iterative process is used for this step that minimises the number of \cs{input}s required. 
+
+  If there are enough write registers to do this in a single pass, only one \cs{input} is necessary; otherwise an iterative process is used for this step that minimises the number of \cs{input}s required.
   This step uses \emph{ALL} of the remaining write registers so it better be the last thing that we do!
   (P.S. it's annoying we can't reclaim now-closed write registers at this point.
    Perhaps we can.)
-  
+
   \item All auxiliary tag files are read in their entirety and stored in respective macros.
   These are then checked for global differences with the tag data from previous run, stored for later at Step~\ref{enum:cache}.
   \end{enumerate}
@@ -470,10 +470,10 @@ This is what happens.
 \auxdata_new_tag:nn {testexpl} {expl}
 \auxdata_new_tag:nn {testuser} {doc}
 \auxdata_new_tag:nn {foo}  {doc}
-\auxdata_new_tag:nn {bar}  {doc} 
-\auxdata_new_tag:nn {box}  {doc} 
-\auxdata_new_tag:nn {tree} {doc} 
-\auxdata_new_tag:nn {blob1} {doc} 
+\auxdata_new_tag:nn {bar}  {doc}
+\auxdata_new_tag:nn {box}  {doc}
+\auxdata_new_tag:nn {tree} {doc}
+\auxdata_new_tag:nn {blob1} {doc}
 \auxdata_new_tag:nn {myref} {doc}
 \auxdata_new_tag:nn {split1} {doc}
 \auxdata_new_tag:nn {split2} {doc}
@@ -679,7 +679,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
 %    \begin{macrocode}
 \usepackage{catchfile,l3regex}
 %    \end{macrocode}
-% 
+%
 % \paragraph{Variables and variants}
 %
 %    \begin{macrocode}
@@ -747,7 +747,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
     \cs_set_protected:Npn \char_set_catcode:nn ##1 ##2
       {
         \tex_catcode:D ##1 = \__int_eval:w ##2 \__int_eval_end:
-      }  
+      }
     \prop_map_inline:Nn \l_@@_catcodes_prop
       { \char_set_catcode:nn {##1} {##2} }
     \prop_clear:N \l_@@_catcodes_prop
@@ -787,7 +787,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
   {
     \prop_map_inline:Nn \g_@@_cc_prop
       {
-        \iow_open:cn {g_auxdata_##1_#1_stream} {#2.aux.##1} 
+        \iow_open:cn {g_auxdata_##1_#1_stream} {#2.aux.##1}
       }
   }
 %    \end{macrocode}
@@ -832,7 +832,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
 %    \begin{macrocode}
 \cs_new:Nn \auxdata_main:
   {
-    \@@_close:n {altn} 
+    \@@_close:n {altn}
     \tl_gset:Nn \g_@@_mainalt_tl {main}
   }
 %    \end{macrocode}
@@ -869,7 +869,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
    \auxdata_new_write:NNn \auxdata_write:nn           \iow_now:cx       {}
    \auxdata_new_write:NNn \auxdata_write_shipout:nn   \iow_shipout:cx   {}
    \auxdata_new_write:NNn \auxdata_write_shipout_x:nn \iow_shipout_x:cx { \exp_not:N }
-   
+
    \cs_undefine:N \@@_setup_fn:
  }
 %    \end{macrocode}
@@ -914,10 +914,10 @@ Don't~ look~ here:~ check~ your~ console~ output!
     \file_if_exist:nT { \jobname.tag.#1 }
       {
         \cs_set:Npn \auxdata:n ##1 {#2}
-                  
+
         \prop_get:NnNF \g_@@_tags_prop {#1} \l_auxdata_this_ccname_tl {\ERROR}
         \prop_get:NVNF \g_@@_cc_prop \l_auxdata_this_ccname_tl \l_auxdata_cc_tl {\ERROR}
-        
+
         \@@_catcodes_pushing:
         \l_auxdata_cc_tl
         \file_input:n { \jobname.tag.#1 }
@@ -961,7 +961,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
 %    \end{macrocode}
 %
 % \begin{macro}[internal]{\@@_cache_previous:}
-% Read in the data stores for later \verb|\@@_check_changes:|. 
+% Read in the data stores for later \verb|\@@_check_changes:|.
 %    \begin{macrocode}
 \cs_new:Nn \@@_cache_previous:
   {
@@ -982,7 +982,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
         \@@_input_aux:nn {##1} {final}
         \tl_if_eq:ccF { g_auxdata_ ##1 _final_tl } { g_auxdata_ ##1 _cache_tl }
           { \typeout{DATA~FOR~TAG~"##1"~HAS~CHANGED;~MAY~NEED~TO~RERUN~LATEX.} }
-      }  
+      }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1060,13 +1060,13 @@ Don't~ look~ here:~ check~ your~ console~ output!
         \exp_args:Nc \iow_new:N {g_@@_write_##1_stream}
         %% TODO: reuse other streams opened by this package
       }
-    
+
     \cs_set:Npn \auxdata:nn ##1 ##2
       {
         \cs_if_exist_use:cT %% <- TODO fix doc bug for this function
           { auxdata_exec_ ##1 :nn } { {##1} {##2} }
       }
-    
+
     \prop_map_inline:Nn \g_@@_cc_prop
       {
 %<debug>        \typeout{===~Catcode~regime~##1~===}
@@ -1079,7 +1079,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
               }
           }
 %<debug>        \typeout{Need~to~write~\seq_count:c {g_@@_cctags_ ##1 _seq}~tag(s);~will~take~\int_use:N \l_@@_groups_int\space iteration(s).}
-        
+
         % iterate that many times:
         \int_step_inline:nnnn {1}{1}{\l_@@_groups_int}
           {
@@ -1092,10 +1092,10 @@ Don't~ look~ here:~ check~ your~ console~ output!
                 \seq_gpop_left:cNT {g_@@_cctags_ ##1 _seq} \l_@@_tag_tl
                   {
 %<debug>                    \typeout{~-~Writing~\jobname.tag.\l_@@_tag_tl }
-                    
+
                     \iow_open:cn {g_@@_write_ ########1 _stream}
                       { \jobname.tag.\l_@@_tag_tl }
-                      
+
                     \cs_set:cpn { auxdata_exec_ \l_@@_tag_tl :nn }
                         ################1 ################2
                       {
@@ -1111,10 +1111,10 @@ Don't~ look~ here:~ check~ your~ console~ output!
                       }
                   }
               }
-            
-            % this does the writing:  
+
+            % this does the writing:
             \file_input:n { \jobname.aux.##1 }
-            
+
             % finish up:
             \int_step_inline:nnnn {1}{1}{\l_@@_files_int}
               { \iow_close:c {g_@@_write_ ########1 _stream} }
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 30a18af..a27d805 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -570,7 +570,7 @@
 % the variable unchanged, while attempting to typeset a big integer
 % without an accessor function will trigger an error, as for other
 % register-like variables.
-% 
+%
 % \begin{function}[EXP]{\__bigint_parse_do:nn}
 %   \begin{syntax}
 %     \cs{__bigint_parse_do:nn} \Arg{bigintexpr} \Arg{code}
diff --git a/l3trial/l3check/build.lua b/l3trial/l3check/build.lua
index 0e7d7c2..2fa904e 100644
--- a/l3trial/l3check/build.lua
+++ b/l3trial/l3check/build.lua
@@ -18,4 +18,4 @@ testfiledir = ""
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index 90bb119..2afc838 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -388,7 +388,7 @@
     \cs_to_str:N #1 \q_stop
     \@@_warning:nnn
     \@@_error:nnn
-  }    
+  }
 \cs_new:Npn \@@_split_name_exp:Nnnn #1
   {
     \exp_after:wN \exp_after:wN
diff --git a/l3trial/l3fp-extras/build.lua b/l3trial/l3fp-extras/build.lua
index 9dd6787..83ec3cf 100644
--- a/l3trial/l3fp-extras/build.lua
+++ b/l3trial/l3fp-extras/build.lua
@@ -15,4 +15,4 @@ maindir = "../.."
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3fp-extras/testfiles/m3fp-functions001.lvt b/l3trial/l3fp-extras/testfiles/m3fp-functions001.lvt
index 59c8eab..367eb29 100644
--- a/l3trial/l3fp-extras/testfiles/m3fp-functions001.lvt
+++ b/l3trial/l3fp-extras/testfiles/m3fp-functions001.lvt
@@ -40,4 +40,4 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\END
\ No newline at end of file
+\END
diff --git a/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.lvt b/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.lvt
index ba091b4..df4b054 100644
--- a/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.lvt
+++ b/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.lvt
@@ -100,4 +100,4 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\END
\ No newline at end of file
+\END
diff --git a/l3trial/l3hooks/build.lua b/l3trial/l3hooks/build.lua
index e7bccea..85ab1cb 100644
--- a/l3trial/l3hooks/build.lua
+++ b/l3trial/l3hooks/build.lua
@@ -18,4 +18,4 @@ checksearch = true
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3htoks/build.lua b/l3trial/l3htoks/build.lua
index 5ecee5d..8dc4fcd 100644
--- a/l3trial/l3htoks/build.lua
+++ b/l3trial/l3htoks/build.lua
@@ -19,4 +19,4 @@ checksearch = true
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3kernel-extras/build.lua b/l3trial/l3kernel-extras/build.lua
index 825a33d..1bba232 100644
--- a/l3trial/l3kernel-extras/build.lua
+++ b/l3trial/l3kernel-extras/build.lua
@@ -15,4 +15,4 @@ maindir = "../.."
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3ldb/build.lua b/l3trial/l3ldb/build.lua
index 1d210b7..2ff4741 100644
--- a/l3trial/l3ldb/build.lua
+++ b/l3trial/l3ldb/build.lua
@@ -18,4 +18,4 @@ checksearch = true
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.lvt b/l3trial/l3ldb/testfiles/m3ldb003.lvt
index 1a2a998..9775110 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.lvt
+++ b/l3trial/l3ldb/testfiles/m3ldb003.lvt
@@ -13,7 +13,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % temporary code which used to be setup in a separate file:
-%   shows that the xtemplate interface needs looking at, at the moment we 
+%   shows that the xtemplate interface needs looking at, at the moment we
 %   use a \__function
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ExplSyntaxOn
diff --git a/l3trial/l3rand/build.lua b/l3trial/l3rand/build.lua
index 329a467..4a6589a 100644
--- a/l3trial/l3rand/build.lua
+++ b/l3trial/l3rand/build.lua
@@ -18,4 +18,4 @@ testfiledir = ""
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3str-format-new/build.lua b/l3trial/l3str-format-new/build.lua
index 12fcc58..7d47a45 100644
--- a/l3trial/l3str-format-new/build.lua
+++ b/l3trial/l3str-format-new/build.lua
@@ -18,4 +18,4 @@ checksearch = true
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/xbox/testfiles/xbox001.lvt b/l3trial/xbox/testfiles/xbox001.lvt
index 127d787..522a965 100644
--- a/l3trial/xbox/testfiles/xbox001.lvt
+++ b/l3trial/xbox/testfiles/xbox001.lvt
@@ -110,4 +110,4 @@
     \showbox{\myboxb}%
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3trial/xbox/testfiles/xbox002.lvt b/l3trial/xbox/testfiles/xbox002.lvt
index 165d7b9..ef2ad61 100644
--- a/l3trial/xbox/testfiles/xbox002.lvt
+++ b/l3trial/xbox/testfiles/xbox002.lvt
@@ -20,7 +20,7 @@
 \START
 
 \AUTHOR{Joseph Wright}
-  
+
 \TEST{\mbox}
   {%
     \sbox{\myboxa}{\mbox{Hello world}}%
@@ -30,7 +30,7 @@
     $\sbox{\myboxa}{\mbox{$y = mx + c$}}$%
     $\showbox{\myboxa}$%
   }
-  
+
 \TEST{\makebox as \mbox}
   {%
     \sbox{\myboxa}{\makebox{Hello world}}%
@@ -40,7 +40,7 @@
     $\sbox{\myboxa}{\makebox{$y = mx + c$}}$%
     $\showbox{\myboxa}$%
   }
-  
+
 \TEST{\makebox to various widths}
   {%
     \sbox{\myboxa}{\makebox[10 pt]{Hello world}}%
@@ -52,7 +52,7 @@
     \sbox{\myboxa}{\makebox[\totalheight + \width]{Hello world}}%
     \showbox{\myboxa}%
   }
-  
+
 \TEST{\makebox to width with alignment}
   {%
     \sbox{\myboxa}{\makebox[2 \width][c]{Hello world}}%
@@ -64,10 +64,10 @@
     \sbox{\myboxa}{\makebox[2 \width][s]{Hello world}}%
     \showbox{\myboxa}%
   }
-  
+
 \TEST{\makebox picture mode syntax}
   {%
     \makebox(10,20){Hello world}%
   }
 
-\END
\ No newline at end of file
+\END
diff --git a/l3trial/xbox/xbox.dtx b/l3trial/xbox/xbox.dtx
index 649713d..45517b6 100644
--- a/l3trial/xbox/xbox.dtx
+++ b/l3trial/xbox/xbox.dtx
@@ -1118,4 +1118,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex
diff --git a/l3trial/xfont/README.md b/l3trial/xfont/README.md
index f8a868b..f004ec4 100644
--- a/l3trial/xfont/README.md
+++ b/l3trial/xfont/README.md
@@ -52,4 +52,4 @@ Just not sure where.
 
 --------------
 Will Robertson
-March 2011
\ No newline at end of file
+March 2011
diff --git a/l3trial/xfont/build.lua b/l3trial/xfont/build.lua
index 49b6d7f..8808bbe 100644
--- a/l3trial/xfont/build.lua
+++ b/l3trial/xfont/build.lua
@@ -24,4 +24,4 @@ checksearch = true
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-dofile (maindir .. "/l3build/l3build.lua")
\ No newline at end of file
+dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/xfont/testfiles/l3font001.lvt b/l3trial/xfont/testfiles/l3font001.lvt
index 6e0b9d7..1d3a845 100644
--- a/l3trial/xfont/testfiles/l3font001.lvt
+++ b/l3trial/xfont/testfiles/l3font001.lvt
@@ -37,4 +37,4 @@
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\END
\ No newline at end of file
+\END
diff --git a/news/l3news08.tex b/news/l3news08.tex
index 05332b3..9544ea2 100644
--- a/news/l3news08.tex
+++ b/news/l3news08.tex
@@ -40,7 +40,7 @@ Bruno's work on the floating point module has been officially released into the
 Here's a neat example as suggested in the documentation, which produces `\calcnum { round ( 200 pi * sin ( 2.3 ^ 5 ) , 2 ) }':
 
 \begin{verbatim}
-\usepackage{xparse, siunitx} 
+\usepackage{xparse, siunitx}
 \ExplSyntaxOn
 \NewDocumentCommand { \calcnum } { m }
   { \num { \fp_to_scientific:n {#1} } }
@@ -101,7 +101,7 @@ commands have found their way into one or another package.  The
 consequences of this is that nowadays it is next to impossible to
 change anything in the \LaTeXe{} kernel (even if it is clearly just an
 internal command) without breaking something.
- 
+
 
 In \LaTeX3 we hope to improve this situation drastically by
 clearly separating public interfaces (that extension packages can use
diff --git a/news/l3news09.tex b/news/l3news09.tex
index 8d2c3f2..8e5da1f 100644
--- a/news/l3news09.tex
+++ b/news/l3news09.tex
@@ -1143,7 +1143,7 @@ These packages cover a broad range of functionality:
 \item[\ctanpkg{hobby}]
 Hobby's algorithm in PGF/TiKZ for drawing optimally smooth curves.
 \item[\ctanpkg{chemmacros}] Typesetting in the field of chemistry.
-\item[\ctanpkg{classics}] Traditional-style citations for the classics. 
+\item[\ctanpkg{classics}] Traditional-style citations for the classics.
 \item[\ctanpkg{conteq}] Continued (in)equalities in mathematics.
 \item[\ctanpkg{ctex}] A collection of macro packages and document classes for Chinese typesetting.
 \item[\ctanpkg{endiagram}] Draw potential energy curve diagrams.
@@ -1294,10 +1294,10 @@ However, the correct relation would be a subset,
 \[
          \textrm{\pkg{expl3}} \subset \textrm{\LaTeX3},
 \]
-with \pkg{expl3} forming the Core Language Layer on which  there will eventually be several other layers on top that \mbox{provide} 
+with \pkg{expl3} forming the Core Language Layer on which  there will eventually be several other layers on top that \mbox{provide}
 \begin{itemize}
-\item higher-level concepts for typesetting (Typesetting Foundation Layer), 
-\item a designer interface for specifying document structures and layouts (Designer Layer), 
+\item higher-level concepts for typesetting (Typesetting Foundation Layer),
+\item a designer interface for specifying document structures and layouts (Designer Layer),
 \item and finally a Document Representation Layer that implements document level syntax.
 \end{itemize}
 Of those four layers, the lowest one\Dash\pkg{expl3}\Dash is available for use and with \pkg{xparse} we have an instance of the Document Representation Layer modeled largely after \LaTeXe{} syntax (there could be others). Both can be successfully used within the current \LaTeXe{} framework and as mentioned above this is increasingly happening.
diff --git a/support/docstrip.tex b/support/docstrip.tex
index b7cfc74..c4cde60 100644
--- a/support/docstrip.tex
+++ b/support/docstrip.tex
@@ -5,16 +5,16 @@
 %% The original source files were:
 %%
 %% docstrip.dtx  (with options: `initex,program,stats')
-%% 
+%%
 %% This is a generated file.
-%% 
+%%
 %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
-%% 
+%%
 %% This file was generated from file(s) of the LaTeX base system.
 %% --------------------------------------------------------------
-%% 
+%%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
@@ -22,17 +22,17 @@
 %%    http://www.latex-project.org/lppl.txt
 %% and version 1.3c or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This file has the LPPL maintenance status "maintained".
-%% 
+%%
 %% This file may only be distributed together with a copy of the LaTeX
 %% base system. You may however distribute the LaTeX base system without
 %% such generated files.
-%% 
+%%
 %% The list of all files belonging to the LaTeX base distribution is
 %% given in the file `manifest.txt'. See also `legal.txt' for additional
 %% information.
-%% 
+%%
 %% The list of derived (unpacked) files belonging to the distribution
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
diff --git a/xpackages/xor/testfiles/xor001.lvt b/xpackages/xor/testfiles/xor001.lvt
index dd93a1d..7a6e47c 100644
--- a/xpackages/xor/testfiles/xor001.lvt
+++ b/xpackages/xor/testfiles/xor001.lvt
@@ -39,7 +39,7 @@
    numbered-id        = figure,
    numbered-within-id = ,
    numbered-action    = \arabic{figure},
-   body-decls         = 
+   body-decls         =
   }
 
 
@@ -126,7 +126,7 @@
    float-area-sep  = 20pt,
    float-float-sep = 20pt,
 %
-   grid-point-sep = 12pt,     
+   grid-point-sep = 12pt,
   }
 
 \usepackage{shortvrb}
@@ -230,7 +230,7 @@ straightforward since some activities are very much faster than
 others.  For example, performing a test by using a reasonable number
 of macro expansions and register assignments may be very much slower
 than running through a long typeset list and then doing a simple test.
- 
+
 
 The algorithm we have implemented fulfills the requirement of being
 (essentially) linear in the number of floats and the number of float
@@ -242,7 +242,7 @@ areas.
 The document source is a single stream of continuous text containing
 call-outs to floating objects. (At the moment the call-outs are marked
 by placing the objects into the stream but it would be possible to
-provide them as separate objects.) 
+provide them as separate objects.)
 Floating objects (as of today) come in three incarnations:
 \begin{itemize}
 \item Objects where the call-out and the placement requires a strict
@@ -288,7 +288,7 @@ headings, lists, and other ``display'' objects are not aligned.}
 The page layouts which are supported by the new algorithm support
 an arbitrary number of text columns of equal width.
 
-\tracefloats 
+\tracefloats
 \tracingmarks=2
 
 \begin{figure}[h]
@@ -300,7 +300,7 @@ an arbitrary number of text columns of equal width.
 \]
 or
 \[
-   pij  \textrm{ with }   i \leq c+s < i+j \leq 
+   pij  \textrm{ with }   i \leq c+s < i+j \leq
                             \mbox{\meta{number-of-columns}}
 \]
 \end{minipage}
@@ -325,7 +325,7 @@ rectangular in shape. Float areas span one or more text columns, their
 horizontal size is therefore given by the following formula (where
 $c$ is the number of columns spanned):
 \[
-   \meta{area-width} =  c \times 
+   \meta{area-width} =  c \times
                         \bigl( \meta{col-width} + \meta{col-sep}\bigr)
                         - \meta{col-sep}
 \]
@@ -339,7 +339,7 @@ digit denoting the number of columns to span. The
 \meta{start-column} is a single digit\footnote{With a bit of care in
 the code this could be extended to allow more than one digit.}
 denoting the start column of the area. Thus |t23| is a top area
-starting at column two and spanning three columns, i.e., two, three 
+starting at column two and spanning three columns, i.e., two, three
 and four.
 A restriction due to the naming scheme is that currently no more than
 9 columns are possible.\footnote{The scheme is different from the
@@ -354,7 +354,7 @@ that result in ``splitting'' the text of a column due to a float (other
 than column `here' floats).\footnote{Perhaps this restriction will be
 lifted one day.} This means that population of some float areas
 must be prevented, namely those satisfying these conditions
-when $pcs$ (where $p=\textrm{pos}$, 
+when $pcs$ (where $p=\textrm{pos}$,
 $c=\textrm{column}$, $s=\textrm{span}$) has just been populated:
 
 \begin{figure}[h]
@@ -366,7 +366,7 @@ $c=\textrm{column}$, $s=\textrm{span}$) has just been populated:
 \]
 or
 \[
-   pij  \textrm{ with }   i \leq c+s < i+j \leq 
+   pij  \textrm{ with }   i \leq c+s < i+j \leq
                             \mbox{\meta{number-of-columns}}
 \]
 \end{minipage}
@@ -470,7 +470,7 @@ have to appear on the same page as their call-outs.
 In its current version, the model supports footnotes beneath the
 call-out column (normal behavior); all footnotes in the last column
 (as with the \texttt{ftnright} package for two-column mode); all
-footnotes in the outer (or inner) margin. 
+footnotes in the outer (or inner) margin.
 
 Without an extension to the page makeup algorithm (but instead with a
 suitable redefinition of the footnote commands) they could be processed
@@ -516,7 +516,7 @@ further trials will be based on adding to this solution (no
 backtracking). If the algorithm fails to place the float into any
 area it means that the float will be deferred to a later page.
 
-As floats are added to areas, the constraints for further trials 
+As floats are added to areas, the constraints for further trials
 are changed. There are several reasons for this:
 on one hand, the call-out positions of
 various floats move
@@ -556,7 +556,7 @@ various information about the float positioning trial, such as the
 area to format it into, the fact that it formats onto a verso or recto
 page, etc. It might try several possibilities before making a decision,
 e.g., if one formatting of the float results in violating some
-constraint(s) it might try a different formatting at 
+constraint(s) it might try a different formatting at
 this point.
 
 
@@ -648,7 +648,7 @@ At the moment the following behaviour can be specified:
 \begin{description}
 \item[strict] which means that the leftmost column spanned
   by the float is being regarded as the column in which the float was placed.
-\item[flexible] which means that the rightmost column spanned 
+\item[flexible] which means that the rightmost column spanned
   by the float is being regarded as the column in which the float was placed.
 \end{description}
 These settings are only relevant if the main float/call-out relations
@@ -659,7 +659,7 @@ are set to |column| or |after|.
 
 It is possible to direct the algorithm to check on each column if
 there are footnotes, and if so to prevent it from placing floats in
-the bottom 
+the bottom
 area. In theory it might be possible that a forbidden constellation
 might resolve itself once the algorithm has added further floats,
 e.g., it could be the case that by adding additional floats the
@@ -943,7 +943,7 @@ Float: \bx at F   {6}  {table} (floats)  {6}   {Running times of the algorithm}
  area trial: b11  -> failed: b11 float num reached (1)
  area trial: b21  -> failed: area below flush point (2=2, b21)
  -> failed: --> retry with relaxed conditions
- 
+
  area trial: b12  -> failed: span count b12 /= 1
  area trial: b11  -> accepted
  STATS: trials = 7
@@ -975,7 +975,7 @@ In the class file the designer is given control over the algorithm's
 behavior in all the aspects described above (and several more).
 
 The layout specifications are done through the new template and
-instance concept, see~\cite{tub:MCR99-3}. 
+instance concept, see~\cite{tub:MCR99-3}.
 Additional information such as experimental code, further
 documentation, etc.\ can
 be found on the \LaTeX{} project web site at:
@@ -986,7 +986,7 @@ be found on the \LaTeX{} project web site at:
 In contrast to the algorithm itself, which in its basic functionality
 now seems to be stable and reliable, the design interface is far
 more experimental. Thus the example declarations given below represent
-only the current state of thought (or of implementation) 
+only the current state of thought (or of implementation)
 and are likely to be modified at any moment.
 
 
@@ -1005,7 +1005,7 @@ properties of the float type, e.g.,
      numbered-boolean   = true,
      numbered-id        = figure,
      numbered-within-id = section,
-     numbered-action    = 
+     numbered-action    =
           \thesection.\arabic{figure},
      body-decls         = ,
     }
@@ -1074,7 +1074,7 @@ floats it is allowed to receive (\texttt{max-float-num}) and through
 two lists which tell the algorithm which other areas are affected by
 adding a float to the current area. The list \texttt{class-close-list}
 enumerates all areas which are not allowed to receive additional
-floats of the same sequence class as the float that has been placed 
+floats of the same sequence class as the float that has been placed
 into the current area, while
 the list \texttt{all-close-list} contains the information about all
 areas that are to be completely closed the moment a float is received
@@ -1142,7 +1142,7 @@ unnamed instances there using the |\UseTemplate| method.
 
 At the heart of the layout declaration are instances of the type
 |pagesetup2.|\footnote{The number 2 has historical reasons and will
-vanish again at some point in the future.} 
+vanish again at some point in the future.}
 An example setup showing all currently available keys is given in
 \begin{table}
   \caption{Example declaration for the \texttt{pagesetup2} template
@@ -1175,7 +1175,7 @@ An example setup showing all currently available keys is given in
      float-inline-sep    = 6pt minus 2pt,
 % grid specification
      grid-point-sep      = 12pt,
-% footnote etc specification 
+% footnote etc specification
      footnote-setup                         = mainmatter,
     }
 \end{verbatim}
@@ -1196,7 +1196,7 @@ The following four keys define the standard constraints for the
 algorithm when placing floats: \texttt{max-\allowbreak
 float-\allowbreak num} is the maximum number of floats that can go on
 a normal page,
-\texttt{float-\allowbreak callout-\allowbreak constraint} defines 
+\texttt{float-\allowbreak callout-\allowbreak constraint} defines
 what kind of relations between float and call-out are allowed,
 possible values are explained on~\vpageref{fl-callout-relations}.
 
@@ -1205,7 +1205,7 @@ constraint} handles the interpretation of spanning floats and is
 explained on~\vpageref{fl-span-relation}, and
 \texttt{bottom-\allowbreak float-\allowbreak footnote-\allowbreak
 constraint} defines whether or not bottom floats are allowed in case
-of footnotes. 
+of footnotes.
 
 The last three constraints are replaced by
 \texttt{flush-\allowbreak float-\allowbreak callout-\allowbreak
@@ -1220,7 +1220,7 @@ float-\allowbreak num} is disregarded in that case automatically).
 
 The key |area-list| defines all float areas that are allowed in this
 page layout as well as defining the order in which the areas are tried
-when placing floats.  
+when placing floats.
 The keys \texttt{defer-class-close-list} and
 \texttt{defer-all-close-list} define the ``closing actions'' for the
 special area which receives the floats that could not be placed. E.g.,
@@ -1335,7 +1335,7 @@ and |t22| where the captions are set to the side.
 
 To test the performance of the algorithm we prepared a somewhat
 ridiculous test file containing three types of floats (``figures'',
-``tables'', and ``algorithms'') with a total number of 47 floats. 
+``tables'', and ``algorithms'') with a total number of 47 floats.
 The chosen
 layout had 3 columns and 11 potential float areas.  Figure captions
 have been placed below the float while with tables and algorithms the
@@ -1350,7 +1350,7 @@ ten floats was allowed per page, i.e., roughly three per column.
 Since the document contained many floats early on (24 on page one) and
 the first of these was especially constructed to be not placeable the
 first time around, the algorithm had to work hard to place all the
-dangling floats. Table~\vref{tab:stats} 
+dangling floats. Table~\vref{tab:stats}
 %
 \begin{table}
 \footnotesize
@@ -1396,7 +1396,7 @@ evaluate). Note that on the third page the algorithm was able to
 produce a float page, on all other pages the float page trial was
 unsuccessful.
 
-Table~\vref{tab:runs} shows the running times 
+Table~\vref{tab:runs} shows the running times
 %
 \begin{table}
 \footnotesize
diff --git a/xpackages/xor/xmarks.dtx b/xpackages/xor/xmarks.dtx
index 6a8bd4e..dbd1823 100644
--- a/xpackages/xor/xmarks.dtx
+++ b/xpackages/xor/xmarks.dtx
@@ -68,7 +68,7 @@
 % \maketitle
 %
 % \begin{documentation}
-% 
+%
 % Marks are used to communicate information about the content of a page
 % to the output routine. Perhaps the clearest form of mark is that needed
 % for sections. In order to construct running headers, the output routine
@@ -76,9 +76,9 @@
 % information is passed by the mark system. However, marks may also be used
 % for other purposes. This module provides a generalised mechanism for marks
 % of independent types.
-% 
+%
 % \section{Design-level interface}
-% 
+%
 % \begin{function}{\DeclareMarkType}
 %   \begin{syntax}
 %     \cs{DeclareMarkType} \Arg{type}
@@ -86,7 +86,7 @@
 %   Declares a \meta{type} of mark to be tracked by \LaTeX{}. Each \meta{type}
 %   must be declared before it is used.
 % \end{function}
-% 
+%
 % \begin{function}{\PutMark}
 %   \begin{syntax}
 %     \cs{PutMark} \Arg{type} \Arg{entry}
@@ -94,7 +94,7 @@
 %   Adds a mark to the current page for the \meta{type}, containing the
 %   \meta{entry} text.
 % \end{function}
-% 
+%
 % \begin{function}[EXP]{\PreviousMark, \FirstMark, \LastMark}
 %   \begin{syntax}
 %     \cs{PreviousMark} \Arg{type}
@@ -109,7 +109,7 @@
 % \end{function}
 %
 % \section{Code-level interface}
-% 
+%
 % \begin{function}{\marks_new:n}
 %   \begin{syntax}
 %     \cs{marks_new:n} \Arg{type}
@@ -117,7 +117,7 @@
 %   Declares a \meta{type} of mark to be tracked by \LaTeX{}. Each \meta{type}
 %   must be declared before it is used.
 % \end{function}
-% 
+%
 % \begin{function}{\marks_put:nn, \marks_put:VV}
 %   \begin{syntax}
 %     \cs{marks_put:nn} \Arg{type} \Arg{entry}
@@ -125,7 +125,7 @@
 %   Adds a mark to the current page for the \meta{type}, containing the
 %   \meta{entry} text.
 % \end{function}
-% 
+%
 % \begin{function}[EXP]
 %   {\marks_get_previous:n, \marks_get_first:n, \marks_get_last:n}
 %   \begin{syntax}
@@ -144,25 +144,25 @@
 %
 % These functions are tied to the output routine, and therefore are not
 % for more general use: they are used in other parts of \pkg{xor}.
-% 
+%
 % \begin{function}{\marks_update_structure:}
 %   \begin{syntax}
 %     \cs{marks_update_structure:}
 %   \end{syntax}
 % \end{function}
-% 
+%
 % \begin{function}{\marks_save_state:}
 %   \begin{syntax}
 %     \cs{marks_save_state:}
 %   \end{syntax}
 % \end{function}
-% 
+%
 % \begin{function}{\marks_OR_restore_state:nn}
 %   \begin{syntax}
 %     \cs{marks_OR_restore_state:nn} \Arg{OR_1} \Arg{OR_2}
 %   \end{syntax}
 % \end{function}
-% 
+%
 % \end{documentation}
 %
 % \begin{implementation}
@@ -413,7 +413,7 @@
 \cs_generate_variant:Nn \marks_put:nn { VV }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\marks_update_structure:}
 % \begin{macro}[aux]
 %   {
@@ -622,7 +622,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
-%  
+%
 % \begin{variable}{\c_marks_OR_i_penalty, \c_marks_OR_ii_penalty}
 %   Two marker penalties for detected that the restore system is used
 %   correctly.
@@ -770,7 +770,7 @@
     does~not~exist.
   }
 %    \end{macrocode}
-%    
+%
 % \subsection{Design-level interface}
 %
 % \begin{macro}{\DeclareMarkType}
@@ -789,7 +789,7 @@
 % \end{macro}
 %
 % \subsection{Support for \LaTeXe{} internals}
-% 
+%
 %    \begin{macrocode}
 %<*package>
 %    \end{macrocode}
@@ -856,7 +856,7 @@
 \DeclareExpandableDocumentCommand \rightmark { } { \LastMark { rightmark } }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
diff --git a/xpackages/xor/xo-balance.tex b/xpackages/xor/xo-balance.tex
index 58891a1..56622a7 100644
--- a/xpackages/xor/xo-balance.tex
+++ b/xpackages/xor/xo-balance.tex
@@ -23,7 +23,7 @@
 %% for those people who are interested.
 %%
 %%%%%%%%%%%
-%% NOTE: %% 
+%% NOTE: %%
 %%%%%%%%%%%
 %%
 %%   Snapshots taken from the repository represent work in progress and may
@@ -33,8 +33,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-%% $Id$  
-%% 
+%% $Id$
+%%
 % \fi
 %
 %
@@ -51,7 +51,7 @@
 %\showoutput
 
 \typeout{}
-\typeout{Due to starting the implementation for middle floats balancing 
+\typeout{Due to starting the implementation for middle floats balancing
 is again broken!}
 \ERROR
 
@@ -76,7 +76,7 @@ is again broken!}
    numbered-id        = figure,
    numbered-within-id = ,
    numbered-action    = \arabic{figure},
-   body-decls         = 
+   body-decls         =
   }
 
 
@@ -147,7 +147,7 @@ is again broken!}
    column-width  = 229.5pt, % this strange value is what LaTeX2e
                             % uses for two column article
    column-num    = 3,
-   column-width  = 160pt, 
+   column-width  = 160pt,
    column-height = 50\baselineskip + \topskip,
    column-sep    = 20pt,
 %
diff --git a/xpackages/xor/xo-capt.dtx b/xpackages/xor/xo-capt.dtx
index 12efbc0..f82114b 100644
--- a/xpackages/xor/xo-capt.dtx
+++ b/xpackages/xor/xo-capt.dtx
@@ -105,7 +105,7 @@
   \xor_typeset_some_floatbox:nnnnnnn
       \g_xor_this_type_tl
       \g_xor_this_area_name_tl
-      \g_xor_this_float_box_tl 
+      \g_xor_this_float_box_tl
       {\csname  g_xor_type_
                  \g_xor_this_type_tl
                 _caption_tl  \endcsname}
diff --git a/xpackages/xor/xo-final.dtx b/xpackages/xor/xo-final.dtx
index e39bd4f..b272463 100644
--- a/xpackages/xor/xo-final.dtx
+++ b/xpackages/xor/xo-final.dtx
@@ -90,7 +90,7 @@
 % the two depths.\footnote{This part of the code was suggested by
 %    Donald Arseneau in bug report pr3189.}
 %    \begin{macrocode}
-       \skip_sub:Nn \g_xor_footins_skip {\box_dp:N\@outputbox} % already limited 
+       \skip_sub:Nn \g_xor_footins_skip {\box_dp:N\@outputbox} % already limited
                                                                % to \@maxdepth
        \vbox_unpack_clear:N \@outputbox
        \dim_compare:nNnTF {\box_dp:N\g_xor_footins_box}>\@maxdepth
@@ -119,7 +119,7 @@
 %
 %    \begin{macrocode}
 
-\trace:n{target~ column~ height:~ \dim_use:c{g_xor_best_ht_col_ 
+\trace:n{target~ column~ height:~ \dim_use:c{g_xor_best_ht_col_
                                              \xor_curr_col_block:
                                              _dim}}
 
@@ -416,9 +416,9 @@
   \xor_forall_columns:n {
 %<*trace>
   \trace:n{bot~aligned~column~\int_use:N\g_xor_curr_col_int :~%
-         ht=\exp_args:No\the {\box_ht:c {g_xor_col_ 
+         ht=\exp_args:No\the {\box_ht:c {g_xor_col_
                                          \xor_curr_col_block: _box}},~
-         dp=\exp_args:No\the {\box_dp:c {g_xor_col_ 
+         dp=\exp_args:No\the {\box_dp:c {g_xor_col_
                                          \xor_curr_col_block: _box }}
   }
 %</trace>
@@ -815,7 +815,7 @@
     \g_xor_this_area_seq {g_xor_area_#1_float_seq}
 %<*trace>
     \cs_set:Npn \trace_seq:n ##1 { \tl_to_str:n {##1} }
-  \trace:n{adding~ floats~ (if any)~ #1~  ==~ 
+  \trace:n{adding~ floats~ (if any)~ #1~  ==~
     '\seq_map_function:NN \g_xor_this_area_seq \trace_seq:n '~
          to~page~list:~#3 }
 %</trace>
diff --git a/xpackages/xor/xo-float.dtx b/xpackages/xor/xo-float.dtx
index b9d271f..0d24261 100644
--- a/xpackages/xor/xo-float.dtx
+++ b/xpackages/xor/xo-float.dtx
@@ -53,7 +53,7 @@
 \tl_new:N\l_xor_curr_float_type_tl
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 % \begin{macro}{\or_float_allocate_box:N}
 %   Recovers the name of an available insert from the list of usable inserts.
 %   This approach means that inserts can be released in a non-ordered fashion,
@@ -110,7 +110,7 @@
 %      }
   }
 %    \end{macrocode}
-%    
+%
 %  Save |\g_xor_curr_float_box_tl| as an |\hbox|.
 %    \begin{macrocode}
   \tl_gset_eq:NN \g_saved_label_tl \c_empty_tl
@@ -163,24 +163,24 @@
 %    \begin{macrocode}
   \int_set:Nn \SPANCNT {1}
   \dim_set:Nn \l_tmpa_dim {\wd \g_xor_curr_float_box_tl }
-  \dim_sub:Nn \l_tmpa_dim \columnwidth 
+  \dim_sub:Nn \l_tmpa_dim \columnwidth
 
   \dim_while_do:nNnn \l_tmpa_dim > \c_zero_dim
     {
      \int_incr:N \SPANCNT
      \dim_sub:Nn \l_tmpa_dim \columnwidth
-     \dim_sub:Nn \l_tmpa_dim \columnsep 
+     \dim_sub:Nn \l_tmpa_dim \columnsep
     }
   \int_compare:nNnT \SPANCNT > \g_xor_cols_int
     {
 %<*trace>
-     \trace:n{WARNING:~ float~ spans~ more~ cols~ than~ available:~ 
+     \trace:n{WARNING:~ float~ spans~ more~ cols~ than~ available:~
               (\int_use:N \SPANCNT > \int_use:N\g_xor_cols_int)}
 %</trace>
      \int_set_eq:NN \SPANCNT \g_xor_cols_int
     }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \edef\@tempa{
     \global\toks\g_xor_curr_float_box_tl{
@@ -368,14 +368,14 @@
 %    contain the float type as part of the name and this type name is
 %    one of the keys.
 %    \begin{macrocode}
-    \TP_unset_key:N \l_floattypesetup_class_id_tl 
+    \TP_unset_key:N \l_floattypesetup_class_id_tl
     \TP_unset_key:N \l_floattypesetup_numbered_id_tl
     \TP_unset_key:N \floattypesetup_numbered_action:
     \TP_unset_key:N \floattypesetup_body_decls:
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-    \clist_clear:N \l_floattypesetup_area_clist 
+    \clist_clear:N \l_floattypesetup_area_clist
 %    \end{macrocode}
 %    Default for the fixed caption text is empty.
 %    \begin{macrocode}
@@ -408,7 +408,7 @@
 %    \end{macrocode}
 %    Float numbers are only set up if requested (which is the default).
 %    \begin{macrocode}
-    \if_meaning:w \c_true_bool \l_tmpa_bool 
+    \if_meaning:w \c_true_bool \l_tmpa_bool
 %    \end{macrocode}
 %    If the |numbered-id| is not set up, we try to default it to
 %    the |type-id|:\footnote{This needs fixing since part of the float
@@ -416,7 +416,7 @@
 %    \begin{macrocode}
       \if_TP_key_unset:NT \l_floattypesetup_numbered_id_tl
         {
-         \tl_set_eq:NN \l_floattypesetup_numbered_id_tl 
+         \tl_set_eq:NN \l_floattypesetup_numbered_id_tl
                         \l_floattypesetup_id_tl
         }
 %    \end{macrocode}
@@ -466,7 +466,7 @@
 %    \end{macrocode}
 %    Then |\g_xor_type_TYPE_extension_tl|:
 %    \begin{macrocode}
-    \tl_gset_eq:cN {g_xor_type_ \l_floattypesetup_id_tl 
+    \tl_gset_eq:cN {g_xor_type_ \l_floattypesetup_id_tl
                      _extension_tl}
                     \l_floattypesetup_toc_ext_tl
 %    \end{macrocode}
@@ -498,11 +498,11 @@
     }
     {
       \clist_gset_eq:cN
-          {g_xor_type_ \l_floattypesetup_id_tl 
+          {g_xor_type_ \l_floattypesetup_id_tl
            _allowed_areas_tl}
           \l_floattypesetup_area_clist
       \clist_gset_eq:cN
-          {fps@ \l_floattypesetup_id_tl} 
+          {fps@ \l_floattypesetup_id_tl}
           \l_floattypesetup_area_clist
     }
 %    \end{macrocode}
@@ -727,7 +727,7 @@
 %
 %    Do we have to set |\if_xor_trial_with_floats:|?\footnote{Check!}
 %    \begin{macrocode}
-  \marks_OR_restore_state:nn 
+  \marks_OR_restore_state:nn
     {
 %<*trace>
      \trace:n{copying~ g_xor_hold_page_box~ onto~ MVL}
@@ -976,7 +976,7 @@
     \seq_gclear:N \g_xor_floats_active_new_seq
 
     \cs_gset_eq:NN \g_xor_this_float_box_tl \scan_stop:
- 
+
     \seq_map_inline:Nn \g_xor_floats_active_seq
 	 {
 	  \int_compare:nNnTF
@@ -1010,7 +1010,7 @@
 %
 %
 % \begin{macro}{\get at float@number}
-% 
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \get at float@number#1#2#3#4#5#6#7{#7}
 %    \end{macrocode}
diff --git a/xpackages/xor/xo-footnote.dtx b/xpackages/xor/xo-footnote.dtx
index 0f0b6fe..b6c8e10 100644
--- a/xpackages/xor/xo-footnote.dtx
+++ b/xpackages/xor/xo-footnote.dtx
@@ -55,10 +55,10 @@
 %    the reference to |\footins| should completely vanish.\footnote{fix}
 %    \begin{macrocode}
 \cs_new_eq:NN  \g_xor_footins_box \footins
-\cs_new_nopar:Npn \g_xor_footins_int  {\count\footins}  
-\cs_new_nopar:Npn \g_xor_footins_dim  {\dimen\footins}  
-\cs_new_nopar:Npn \g_xor_footins_skip {\skip\footins}  
-\cs_new_nopar:Npn \g_xor_footins_toks {\toks\footins}  
+\cs_new_nopar:Npn \g_xor_footins_int  {\count\footins}
+\cs_new_nopar:Npn \g_xor_footins_dim  {\dimen\footins}
+\cs_new_nopar:Npn \g_xor_footins_skip {\skip\footins}
+\cs_new_nopar:Npn \g_xor_footins_toks {\toks\footins}
 %    \end{macrocode}
 %  \end{macro}
 %
@@ -68,10 +68,10 @@
 %    \begin{macrocode}
 \newinsert\g_xor_extrains_box
 \newinsert\@kludgeins
-\cs_new_nopar:Npn \g_xor_extrains_int  {\count\g_xor_extrains_box}  
-\cs_new_nopar:Npn \g_xor_extrains_dim  {\dimen\g_xor_extrains_box}  
-\cs_new_nopar:Npn \g_xor_extrains_skip {\skip\g_xor_extrains_box}  
-\cs_new_nopar:Npn \g_xor_extrains_toks {\toks\g_xor_extrains_box}  
+\cs_new_nopar:Npn \g_xor_extrains_int  {\count\g_xor_extrains_box}
+\cs_new_nopar:Npn \g_xor_extrains_dim  {\dimen\g_xor_extrains_box}
+\cs_new_nopar:Npn \g_xor_extrains_skip {\skip\g_xor_extrains_box}
+\cs_new_nopar:Npn \g_xor_extrains_toks {\toks\g_xor_extrains_box}
 
 \g_xor_extrains_skip=10pt plus 10pt\relax
 \g_xor_extrains_int=1000 \relax
@@ -155,7 +155,7 @@
 %
 %  \begin{macro}{\g_xor_saved_footins_box}
 %  \begin{macro}{\g_xor_saved_footins_dim}
-%    
+%
 %    \begin{macrocode}
 \box_new:N \g_xor_saved_footins_box
 \dim_new:N \g_xor_saved_footins_dim
@@ -176,14 +176,14 @@
 
 
 %  \begin{macro}{\g_xor_footins_col_int}
-%    
+%
 %    \begin{macrocode}
 \int_new:N \g_xor_footins_col_int
 %    \end{macrocode}
 %  \end{macro}
 
 %  \begin{macro}{\g_xor_footins_multicolumn_final_run_bool}
-%    
+%
 %    \begin{macrocode}
 \bool_new:N \g_xor_footins_multicolumn_final_run_bool
 %    \end{macrocode}
@@ -219,7 +219,7 @@
   \dim_gset:Nn \g_xor_footins_hsize_dim \columnwidth
   \int_gset:Nn \g_xor_footins_int       \c_one_thousand
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \cs_set_eq:NN \xor_initialize_page_footins_action:    \prg_do_nothing:
   \cs_set_eq:NN \xor_initialize_column_footins_action:  \prg_do_nothing:
@@ -258,7 +258,7 @@
 
   \cs_set_eq:NN \xor_initialize_page_footins_action:   \xor_initialize_page_footins_ftnright:
   \cs_set_eq:NN \xor_initialize_column_footins_action: \xor_initialize_column_footins_ftnright:
-  \cs_set_eq:NN \xor_initialize_balance_footins_action:\prg_do_nothing: 
+  \cs_set_eq:NN \xor_initialize_balance_footins_action:\prg_do_nothing:
   \cs_set_eq:NN \xor_column_end_footins_action:        \xor_deal_with_footins_ftnright:
 
  }
@@ -289,9 +289,9 @@
 %
 %
 %  \begin{macro}{\xor_initialize_column_footins_ftnright:}
-%    
+%
 %    \begin{macrocode}
-\cs_new_nopar:Npn \xor_initialize_column_footins_ftnright: { 
+\cs_new_nopar:Npn \xor_initialize_column_footins_ftnright: {
 %<*trace>
   \trace:n{ftnspread:~ page =~ \int_use:N\g_xor_page_absolute_int}
   \trace:n{ftnspread:~ col~ =~ \int_use:N\g_xor_curr_col_int}
@@ -422,7 +422,7 @@
 %
 % \begin{macro}{\xor_initialize_column_footins_ftnrightspread:}
 %    \begin{macrocode}
-\cs_new_nopar:Npn \xor_initialize_column_footins_ftnrightspread: { 
+\cs_new_nopar:Npn \xor_initialize_column_footins_ftnrightspread: {
   \xor_initialize_column_footins_ftnright:
 }
 %    \end{macrocode}
@@ -456,7 +456,7 @@
          \dim_gset:Nn  \g_xor_footins_dim \textheight                   %%%% ????
        }
     }
-    { 
+    {
 %<*trace>
   \trace:n{ftnspread:~even~ page}
 %</trace>
@@ -530,12 +530,12 @@
 
   \AssignTemplateKeys
 
-  \int_gset:Nn  \g_xor_footins_int  
+  \int_gset:Nn  \g_xor_footins_int
                 { \c_one_thousand / \g_xor_footins_col_int }
 
   \cs_set_eq:NN \xor_initialize_page_footins_action:   \xor_initialize_page_footins_multicolumn:
   \cs_set_eq:NN \xor_initialize_column_footins_action: \xor_initialize_column_footins_multicolumn:
-  \cs_set_eq:NN \xor_initialize_balance_footins_action:\prg_do_nothing: 
+  \cs_set_eq:NN \xor_initialize_balance_footins_action:\prg_do_nothing:
   \cs_set_eq:NN \xor_column_end_footins_action:        \xor_deal_with_footins_multicolumn:
 
   \dim_gset:Nn \g_xor_footins_hsize_dim
@@ -550,7 +550,7 @@
 
 
 %  \begin{macro}{\xor_initialize_page_footins_multicolumn:}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_initialize_page_footins_multicolumn: {
 %<*trace>
@@ -560,7 +560,7 @@
   \box_gclear:N \g_xor_saved_footins_box
   \box_gclear:N \g_xor_extrains_box
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \bool_if:NTF \g_xor_footins_multicolumn_final_run_bool
     {
@@ -571,17 +571,17 @@
      \int_gzero:N  \g_xor_footins_int
     }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     {
 %<*trace>
      \trace:n{ftnmult:~ trial~ run}
 %</trace>
-     \int_gset:Nn  \g_xor_footins_int  
+     \int_gset:Nn  \g_xor_footins_int
                    { \g_xor_cols_int * \c_one_thousand / \g_xor_footins_col_int }
      \skip_gset:Nn \g_xor_footins_skip {\g_xor_final_footins_skip}
 
-     \dim_gzero:N \g_xor_saved_footins_dim 
+     \dim_gzero:N \g_xor_saved_footins_dim
     }
 %<*trace>
   \trace_pop:n{xor_initialize_page_footins_multicolumn:}
@@ -593,7 +593,7 @@
 
 
 %  \begin{macro}{\xor_initialize_column_footins_multicolumn:}
-%    
+%
 %    \begin{macrocode}
 \cs_set_nopar:Npn \xor_initialize_column_footins_multicolumn: {
 %<*trace>
@@ -603,7 +603,7 @@
   \box_gclear:N \g_xor_extrains_box
   \dim_compare:nNnT \g_xor_saved_footins_dim > \c_zero_dim
     { \insert\g_xor_extrains_box{\floatingpenalty \@MM
-                                 \hrule width  \c_zero_dim 
+                                 \hrule width  \c_zero_dim
                                         height \g_xor_saved_footins_dim} }
 %<*trace>
   \trace_pop:n{xor_initialize_column_footins_multicolumn:}
@@ -615,7 +615,7 @@
 
 
 %  \begin{macro}{\xor_deal_with_footins_multicolumn:}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_deal_with_footins_multicolumn: {
 %<*trace>
@@ -628,11 +628,11 @@
 	       \vbox_unpack_clear:N\g_xor_footins_box}
 	}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \int_compare:nNnT \g_xor_curr_col_int = \g_xor_cols_int
     {
-     \xor_format_footins_multicolumn:NN 
+     \xor_format_footins_multicolumn:NN
 	\g_xor_saved_footins_box
 	\g_xor_footins_col_int
 
@@ -653,7 +653,7 @@
          {
 %<*trace>
           \trace:n{Ooops~ footnote~ space~ needed~ changed:~
-                   before~ \dim_use:N \g_xor_saved_footins_dim \space 
+                   before~ \dim_use:N \g_xor_saved_footins_dim \space
                    now~ \dim_use:N \ht \g_xor_saved_footins_box }
           \trace:n{g_xor_trial_rerun_requested_bool ~<-~ true}
 %</trace>
@@ -678,7 +678,7 @@
 
        \dim_gset:Nn \g_xor_saved_footins_dim {\ht \g_xor_saved_footins_box }
 %<*trace>
-       \trace:n{calculated~footnote~ space:~ 
+       \trace:n{calculated~footnote~ space:~
                      \dim_use:N \g_xor_saved_footins_dim }
 %</trace>
       }
@@ -693,7 +693,7 @@
 %
 %
 %  \begin{macro}{\xor_format_footins_multicolumn:NN}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_format_footins_multicolumn:NN #1 #2 {
       \box_if_empty:NF #1
diff --git a/xpackages/xor/xo-here.dtx b/xpackages/xor/xo-here.dtx
index 9eaacbf..a9e5177 100644
--- a/xpackages/xor/xo-here.dtx
+++ b/xpackages/xor/xo-here.dtx
@@ -71,7 +71,7 @@
 %    \begin{macrocode}
 \cs_new_nopar:Npn \requirespace #1 {
   \mode_if_horizontal:T { \@bsphack }
-  \or_float_allocate_box:N \g_xor_curr_float_box_tl 
+  \or_float_allocate_box:N \g_xor_curr_float_box_tl
 %    \end{macrocode}
 %    We are only interested in the type really:
 %    \begin{macrocode}
@@ -176,7 +176,7 @@
   }
   {
     \int_compare:nNnTF \g_xor_curr_col_int = \g_xor_cols_int
-       { 
+       {
 %<*trace>
          \trace:n{in~ last~ column}
 %</trace>
@@ -286,7 +286,7 @@
 %    \begin{macrocode}
 %<*trace>
             \trace:n{Fail:~ target~ area~  column~ earlier~
-                   (\int_use:N \l_xor_returned_float_col_int 
+                   (\int_use:N \l_xor_returned_float_col_int
                     < \int_use:N\g_xor_curr_col_int)}
 %</trace>
             \bool_gset_true:N \g_xor_trial_failed_bool
@@ -411,7 +411,7 @@
 %    \begin{macrocode}
     \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl < \g_xor_returned_delta_size_tl
     {
-      \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl 
+      \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl
                         < {2\g_xor_float_inline_shrink_dim}
       {
 %    \end{macrocode}
diff --git a/xpackages/xor/xo-new.dtx b/xpackages/xor/xo-new.dtx
index 314833d..ee87e55 100644
--- a/xpackages/xor/xo-new.dtx
+++ b/xpackages/xor/xo-new.dtx
@@ -50,7 +50,7 @@
 %
 %
 %  \begin{macro}{\g_test_bool}
-%    
+%
 %    \begin{macrocode}
       \bool_new:N\g_test_bool
 %    \end{macrocode}
@@ -149,7 +149,7 @@
     \fi
    }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     \mbox at addtopage (\pagebodylefthpos, -\headsep)
        { \xor_generate_running_head: }
@@ -184,7 +184,7 @@
 % needs a totally different approach!!!
 
 \advance \csname g_xor_best_ht_col_ \xor_curr_col_block:
-                 _dim\endcsname 
+                 _dim\endcsname
 by \dimen\g_xor_curr_col_int \relax
 
 %<*trace>
@@ -212,7 +212,7 @@ by \dimen\g_xor_curr_col_int \relax
 % here we adjust for the fact that the text column size is rubbish if
 % balancing was involved!
 
-\dimen\g_xor_curr_col_int = 
+\dimen\g_xor_curr_col_int =
    \csname g_xor_best_ht_col_ \xor_curr_col_block: _dim\endcsname
 
 %<*trace>
@@ -254,7 +254,7 @@ by \dimen\g_xor_curr_col_int \relax
 
 %%{\showoutput\showbox\page at box}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
    \setlength \l_tmpa_dim       % add footer PvO
      {\textheight + \footskip}
@@ -439,7 +439,7 @@ by \dimen\g_xor_curr_col_int \relax
 
 % of course \top at areas and \bot at areas should be constructed
 % automatically when preparing the \g_xor_areas_used_clist or from the
-% \g_xor_areas_known_clist 
+% \g_xor_areas_known_clist
 % but for now i simply define them here:
 
 \cs_set_nopar:Npn \top at areas{t13 t12 t22 t32 t11 t21 t31}
@@ -486,7 +486,7 @@ by \dimen\g_xor_curr_col_int \relax
 % right now
 %      \xor_perhaps_write_to_fpl_file:n{
 %        \@spaces Area:~hhh^^J
-%        \exp_after:wN 
+%        \exp_after:wN
 %        \xor_gen_float_placement_fpl_info:nnnnnnn
 %           \the\toks\g_xor_curr_float_box_tl
 %      }
@@ -553,20 +553,20 @@ by \dimen\g_xor_curr_col_int \relax
       {
        \exp_args:Nc
 	 \xor_construct_and_test_col_ht:nnn
-	   {g_xor_ht_col_ 
-	    \int_use:N \l_xor_update_col_int 
+	   {g_xor_ht_col_
+	    \int_use:N \l_xor_update_col_int
             _
             \xor_if_this_area_type:NTF {b}
-              {\int_use:c{g_xor_col_ 
-                          \int_use:N \l_xor_update_col_int 
+              {\int_use:c{g_xor_col_
+                          \int_use:N \l_xor_update_col_int
                           _block_int}}
               {1}
 	    _dim }
 	   {\int_use:N \l_xor_update_col_int
             _
             \xor_if_this_area_type:NTF {b}
-              {\int_use:c{g_xor_col_ 
-                          \int_use:N \l_xor_update_col_int 
+              {\int_use:c{g_xor_col_
+                          \int_use:N \l_xor_update_col_int
                           _block_int}}
               {1}
            }
@@ -596,20 +596,20 @@ by \dimen\g_xor_curr_col_int \relax
       {
        \exp_args:Nc
 	 \xor_construct_and_test_col_ht:nnn
-	   {g_xor_ht_col_ 
-	    \int_use:N \l_xor_update_col_int 
+	   {g_xor_ht_col_
+	    \int_use:N \l_xor_update_col_int
             _
             \xor_if_this_area_type:NTF {b}
-              {\int_use:c{g_xor_col_ 
-                          \int_use:N \l_xor_update_col_int 
+              {\int_use:c{g_xor_col_
+                          \int_use:N \l_xor_update_col_int
                           _block_int}}
               {1}
 	    _dim }
 	   {\int_use:N \l_xor_update_col_int
             _
             \xor_if_this_area_type:NTF {b}
-              {\int_use:c{g_xor_col_ 
-                          \int_use:N \l_xor_update_col_int 
+              {\int_use:c{g_xor_col_
+                          \int_use:N \l_xor_update_col_int
                           _block_int}}
               {1}
            }
@@ -618,21 +618,21 @@ by \dimen\g_xor_curr_col_int \relax
 % split the column (for the moment use trivial and incorrect algorithm without
 %    any configuration possibilities)
 %
-\int_gincr:c{g_xor_col_ 
-             \int_use:N \l_xor_update_col_int 
+\int_gincr:c{g_xor_col_
+             \int_use:N \l_xor_update_col_int
              _block_int}
 \exp_args:NNc \dim_set:Nn \l_tmpa_dim
-           {g_xor_ht_col_ 
-  	     \int_use:N \l_xor_update_col_int 
+           {g_xor_ht_col_
+  	     \int_use:N \l_xor_update_col_int
              _1
 	     _dim }
-\dim_gset:cn{g_xor_ht_col_ 
-  	     \int_use:N \l_xor_update_col_int 
+\dim_gset:cn{g_xor_ht_col_
+  	     \int_use:N \l_xor_update_col_int
              _1
 	     _dim }
             {.6\l_tmpa_dim}
-\dim_gset:cn{g_xor_ht_col_ 
-  	     \int_use:N \l_xor_update_col_int 
+\dim_gset:cn{g_xor_ht_col_
+  	     \int_use:N \l_xor_update_col_int
              _2
 	     _dim }
             {.4\l_tmpa_dim}
@@ -727,7 +727,7 @@ by \dimen\g_xor_curr_col_int \relax
   \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl
                   < \g_xor_returned_delta_size_tl
   {
-    \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl 
+    \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl
                     < \g_xor_float_text_shrink_dim
     {
 %<*trace>
@@ -790,7 +790,7 @@ by \dimen\g_xor_curr_col_int \relax
 %    \begin{macrocode}
     \xor_if_this_area_type:NT {b}
      {
-      \tl_gset:cx {g_xor_saved_bottom_ht_col_ #3 _tl} 
+      \tl_gset:cx {g_xor_saved_bottom_ht_col_ #3 _tl}
                    {\dim_use:c{g_xor_bottom_ht_col_ #3 _dim}}
       \dim_gadd:cn{g_xor_bottom_ht_col_ #3 _dim}\l_tmpa_dim
 %<*trace>
@@ -842,7 +842,7 @@ by \dimen\g_xor_curr_col_int \relax
 %
 %    \begin{macrocode}
   \int_compare:nTF  {
-    \g_xor_curr_col_block_int < 
+    \g_xor_curr_col_block_int <
       \int_use:c {g_xor_col_
         \int_use:N\g_xor_curr_col_int
         _block_int}
@@ -851,7 +851,7 @@ by \dimen\g_xor_curr_col_int \relax
 %<*trace>
      \trace:n{preparing~ second~ block}
 %</trace>
-     \int_gincr:N \g_xor_curr_col_block_int 
+     \int_gincr:N \g_xor_curr_col_block_int
      \dim_gset_eq:Nc \vsize {g_xor_ht_col_
                           \xor_curr_col_block:
                          _dim}
@@ -874,7 +874,7 @@ by \dimen\g_xor_curr_col_int \relax
 %
 %    Especially while doing balancing and not having reached the final
 %    balanced solution,
-%    no tests should be made since they would fail the 
+%    no tests should be made since they would fail the
 %    trial!\footnote{this now disables the checks even on last run! fix!}
 %    \begin{macrocode}
      \bool_if:NTF \g_xor_balance_point_expected_bool
@@ -887,10 +887,10 @@ by \dimen\g_xor_curr_col_int \relax
        \bool_if:NF \g_xor_trial_failed_bool
 	{
 	 \bool_if:NT \g_xor_trial_with_floats_bool
-	   { \xor_check_float_constraints: 
+	   { \xor_check_float_constraints:
 %    \end{macrocode}
 %    If we haven't failed already, then  for each float sequence class, call
-%    |\xor_check_callout_constraints:n| 
+%    |\xor_check_callout_constraints:n|
 %    this will be set via a call to a pagesetup template to do an
 %    appropriate check on the float placement relative to float
 %    call-out.
@@ -918,7 +918,7 @@ by \dimen\g_xor_curr_col_int \relax
      \int_compare:nNnTF \g_xor_curr_col_int=\g_xor_cols_int
        {
         \bool_if:NTF \g_xor_trial_rerun_requested_bool
-          { 
+          {
 %<*trace>
            \trace:n{trial~ rerun~ requested}
 %</trace>
@@ -937,7 +937,7 @@ by \dimen\g_xor_curr_col_int \relax
          \xor_OR_trial_grab_next_col_setup:
        }
 %    \end{macrocode}
-%    
+%
 %    If we had a premature ending during the collection we have to reinsert
 %    the corresponding penalty (after the OR has placed any material back to
 %    the main vertical list) --- hope this is the right place for it.
@@ -970,13 +970,13 @@ by \dimen\g_xor_curr_col_int \relax
   \trace_push:n{xor_OR_best_finish_col_or_block:}
 %</trace>
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \marks_update_structure:
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-  \int_compare:nTF  { \g_xor_curr_col_block_int 
+  \int_compare:nTF  { \g_xor_curr_col_block_int
                     < \int_use:c {g_xor_col_
                        \int_use:N\g_xor_curr_col_int
                       _block_int}
@@ -985,7 +985,7 @@ by \dimen\g_xor_curr_col_int \relax
 %<*trace>
      \trace:n{preparing~ second~ block}
 %</trace>
-     \int_gincr:N \g_xor_curr_col_block_int 
+     \int_gincr:N \g_xor_curr_col_block_int
      \dim_gset_eq:Nc \vsize {g_xor_ht_col_
                           \xor_curr_col_block:
                          _dim}
@@ -1087,7 +1087,7 @@ by \dimen\g_xor_curr_col_int \relax
 %    \begin{macrocode}
       \xor_initialize_balance_footins_action:
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
       \xor_if_grab_for_balance_done:TF
         {
@@ -1117,17 +1117,17 @@ by \dimen\g_xor_curr_col_int \relax
     \xor_produce_final_column:
   }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
   \int_compare:nNnTF \g_xor_curr_col_int = \g_xor_cols_int
   {
    \bool_if:NTF \g_xor_trial_rerun_requested_bool
-     { 
+     {
 %<*trace>
       \trace:n{final~ rerun~ requested}
       \trace:n{g_xor_trial_rerun_requested_bool ~<-~ false}
 %</trace>
-      \bool_gset_false:N \g_xor_trial_rerun_requested_bool  
+      \bool_gset_false:N \g_xor_trial_rerun_requested_bool
 
       \cs_gset_eq:NN \g_xor_floats_here_seq \g_xor_saved_floats_here_seq
 %<*trace>
@@ -1173,7 +1173,7 @@ by \dimen\g_xor_curr_col_int \relax
 
 
 %  \begin{macro}{\xor_OR_restart_best_cols_setup:}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_OR_restart_best_cols_setup: {
   \marks_OR_restore_state:nn
@@ -1182,7 +1182,7 @@ by \dimen\g_xor_curr_col_int \relax
    \trace:n{copying~ g_xor_hold_page_box~ onto~ MVL}
 %</trace>
     \vbox_unpack:N \g_xor_hold_page_box
-    \xor_add_badly_guarded_penalty:N \c_xor_output_collect_penalty 
+    \xor_add_badly_guarded_penalty:N \c_xor_output_collect_penalty
    }
    { \xor_OR_best_cols_setup: }
 }
@@ -1225,7 +1225,7 @@ by \dimen\g_xor_curr_col_int \relax
 % the two depths.\footnote{This part of the code was suggested by
 %    Donald Arseneau in bug report pr3189.}
 %    \begin{macrocode}
-       \skip_sub:Nn \g_xor_footins_skip {\box_dp:N\@outputbox} % already limited 
+       \skip_sub:Nn \g_xor_footins_skip {\box_dp:N\@outputbox} % already limited
                                                                % to \@maxdepth
        \vbox_unpack_clear:N \@outputbox
        \dim_compare:nNnTF {\box_dp:N\g_xor_footins_box}>\@maxdepth
@@ -1274,7 +1274,7 @@ by \dimen\g_xor_curr_col_int \relax
 %
 %    \begin{macrocode}
 
-\trace:n{target~ column~ height:~ \dim_use:c{g_xor_best_ht_col_ 
+\trace:n{target~ column~ height:~ \dim_use:c{g_xor_best_ht_col_
                                              \xor_curr_col_block:
                                              _dim}
         }
@@ -1282,7 +1282,7 @@ by \dimen\g_xor_curr_col_int \relax
 
 %%%   \vbox_gset_to_ht:ccn {g_xor_col_ \xor_curr_col_block: _box}
    \vbox_gset_to_ht:cnn {g_xor_col_ \int_use:N\g_xor_curr_col_int _1 _box}
-                        { \dim_use:c{g_xor_best_ht_col_ 
+                        { \dim_use:c{g_xor_best_ht_col_
                                              \xor_curr_col_block:
                                              _dim}}
           { % this should one day become \@colht
diff --git a/xpackages/xor/xo-or.dtx b/xpackages/xor/xo-or.dtx
index 09bbc1a..58f9f38 100644
--- a/xpackages/xor/xo-or.dtx
+++ b/xpackages/xor/xo-or.dtx
@@ -107,7 +107,7 @@
 %   we are doing grid typesetting and have to adjust the vertical size of
 %   object to be added, e.g., an inline float with its caption.
 % \end{variable}
-% 
+%
 % \begin{function}
 %   {
 %     \xor_calculate_float_col:,
@@ -137,7 +137,7 @@
 %   Note: the current interface is to assign
 %   \cs{xor_calculate_float_col:} different code depending on which
 %   calculation should be carried out. This should not be the finally
-%   exposed interface on the designer level! 
+%   exposed interface on the designer level!
 %
 %   Note2: the name of this function is rather bad too.
 % \end{function}
@@ -210,7 +210,7 @@
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 %</package>
 %    \end{macrocode}
-%    
+%
 % \begin{variable}{\l_xor_loop_int}
 %   Used for tracking loops: set up separately from the scratch counter
 %   so there is no danger of a clash.
@@ -218,7 +218,7 @@
 \int_new:N \l_xor_loop_int
 %    \end{macrocode}
 % \end{variable}
-%    
+%
 % \begin{variable}{\l_xor_tmp_box}
 % \begin{variable}{\l_xor_tmp_dim}
 % \begin{variable}{\l_xor_tmp_int}
@@ -236,7 +236,7 @@
 % \end{variable}
 %
 % \subsection{To be moved elsewhere beyond the OR}
-% 
+%
 % \begin{macro}{\clist_gconcat:NNc}
 %   Add to \pkg{l3clist} perhaps: that seems to be the official approach.
 %    \begin{macrocode}
@@ -315,7 +315,7 @@
 \int_const:Nn \c_xor_output_collect_penalty { -20202 }
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \begin{variable}{\c_xor_output_nospace_penalty}
 %    Penalty marker if during trials the \tn{vsize} ended up smaller
 %    than \tn{baselineskip}.
@@ -1053,9 +1053,9 @@
 \dim_new:N \g_xor_float_inline_shrink_dim
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \subsection{Utilities for float area structures}
-% 
+%
 % \begin{macro}[EXP, TF]{\xor_if_this_area_type:N}
 %   Test for the type of the current area (|t|, |m|, |b|, or |c|) and execute
 %   the true or false clause.
@@ -1070,7 +1070,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\xor_area_setup:}
 %    Initialize all float areas used within the current page setup.
 %    \begin{macrocode}
@@ -1085,7 +1085,7 @@
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\xor_this_area_setup:n, \xor_this_area_setup:o}
 % \begin{macro}{\xor_this_area_setup_aux:NNN}
 %   Whenever the algorithm works with some area as the current
@@ -1125,7 +1125,7 @@
 \cs_new_protected:Npn \xor_update_this_area_span_cols:n #1
   {
     \group_begin:
-      \int_set:Nn \l_xor_update_col_int 
+      \int_set:Nn \l_xor_update_col_int
         { \g_xor_this_area_col_tl + \g_xor_this_area_span_tl }
       \int_while_do:nNnn \g_xor_this_area_col_tl < \l_xor_update_col_int
         {
@@ -1243,7 +1243,7 @@
 % \end{macro}
 %
 % \subsection{Collection Output Routine}
-% 
+%
 % \begin{variable}{\g_xor_saved_top_skip}
 %   Used to save the value of the \tn{topskip} so it can be reset
 %   safely.
@@ -1365,21 +1365,21 @@
 \bool_new:N \g_xor_collect_new_stuff_bool
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \begin{variable}{\g_xor_page_depth_dim}
 %   Used to store the page depth when dealing with a marker penalty.
 %    \begin{macrocode}
 \dim_new:N \g_xor_page_depth_dim
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \begin{variable}{g_xor_saved_output_penalty_int}
 %   Saves the output penalty.
 %    \begin{macrocode}
 \int_new:N \g_xor_saved_output_penalty_int
 %    \end{macrocode}
 % \end{variable}
-% 
+%
 % \begin{variable}{\g_xor_partial_mvl_box}
 %   Need a box to store the partially collected galley.
 %    \begin{macrocode}
@@ -1417,7 +1417,7 @@
     \bool_if:nTF
       {
         \int_compare_p:nNn \tex_outputpenalty:D < { -\c_ten_thousand } &&
-        \int_compare_p:nNn \tex_outputpenalty:D > 
+        \int_compare_p:nNn \tex_outputpenalty:D >
                                      { \c_xor_output_collect_penalty }
       }
       { \xor_OR_collect_special: }
@@ -1457,7 +1457,7 @@
     \trace:n
       {
         Forced~break~( \int_use:N \tex_outputpenalty:D )~seen~
-        \msg_line_context: 
+        \msg_line_context:
       }
 %</trace>
 %    \end{macrocode}
@@ -1596,7 +1596,7 @@
     \bool_if:NT \g_xor_collect_new_stuff_bool
       {
         \int_compare:nNnF
-          \tex_outputpenalty:D = \c_xor_output_columnbreak_penalty 
+          \tex_outputpenalty:D = \c_xor_output_columnbreak_penalty
           {
             \int_compare:nNnF
               \tex_outputpenalty:D = \c_xor_output_balance_penalty
@@ -1801,7 +1801,7 @@
 % \end{verbatim}
 %     \end{footnotesize}
 % \end{description}
-% 
+%
 % \begin{variable}{\g_xor_trial_with_floats_bool}
 %   When we are doing trials with floats then more work is necessary compared
 %   to the situation without any floats. The boolean
@@ -2406,7 +2406,7 @@
               {
                 \c_space_tl
                 g_xor_flseq_areas_top_type_ \g_xor_this_class_tl _col_
-                \int_use:N \l_xor_returned_float_col_int _int 
+                \int_use:N \l_xor_returned_float_col_int _int
                 \c_space_tl <-~
                 \int_use:N \g_xor_this_flseq_int % As it is equal at this point
               }
@@ -2430,7 +2430,7 @@
 %<*trace>
             \trace:n
               {
-                g_xor_saved_flush_ \int_use:N \l_xor_loop_int _min_col_int 
+                g_xor_saved_flush_ \int_use:N \l_xor_loop_int _min_col_int
                 \c_space_tl <-~
                 \int_use:c
                   { g_xor_flush_ \int_use:N \l_xor_loop_int _min_col_int }
@@ -2461,7 +2461,7 @@
 %   column number for which the
 %   |\fl@|\meta{col}|@number|\footnote{somehow this part lists old
 %      code conventions ... need to check how the fl sequences/numbers are now
-%      named} 
+%      named}
 %   has to be updated in case we place the current float into
 %   the area with start column \cs{g_xor_this_area_col_tl} and
 %   span-number \cs{g_xor_this_area_span_tl}.\footnote{I don't follow
@@ -2631,7 +2631,7 @@
     \trace:n { output~pen:~ \int_use:N \tex_outputpenalty:D }
     \trace:n
       {
-        #1 ~col:~ \int_use:N \g_xor_curr_col_int \c_space_tl 
+        #1 ~col:~ \int_use:N \g_xor_curr_col_int \c_space_tl
         of~ \int_use:N \g_xor_cols_int
       }
     \trace:n
@@ -2784,7 +2784,7 @@
       {
         \dim_set:Nn \l_xor_tmp_dim { \tex_pagegoal:D - \tex_pagetotal:D }
         \dim_compare:nNnTF
-          \l_xor_tmp_dim < 
+          \l_xor_tmp_dim <
             {
               \tl_use:c
                 {
@@ -2861,17 +2861,17 @@
   }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\xor_reinsert_inserts:}
 %    For reinserting the inserts.
-%    
+%
 %    ? FRANK ? Any idea what is the correct code here in format mode?
 %    I assume that \cs{footins} and \cs{@kludgeins} live on in some form?
 %    \begin{macrocode}
 %<*initex>
 \cs_new_protected_nopar:Npn \xor_reinsert_inserts:
   {
-    \ERROR 
+    \ERROR
   }
 %</initex>
 %<*package>
@@ -2882,7 +2882,7 @@
 %
 % \begin{macro}{\xor_handle_flush:nn}
 %    \begin{macrocode}
-\cs_new_protected:Npn \xor_handle_flush:nn #1#2 
+\cs_new_protected:Npn \xor_handle_flush:nn #1#2
   {
     \int_gincr:N \g_xor_trial_flush_seen_int
 %<*trace>
@@ -3110,7 +3110,7 @@
           {
             \int_use:c
               {
-                g_xor_flush_ \int_use:N \g_xor_trial_flush_seen_int 
+                g_xor_flush_ \int_use:N \g_xor_trial_flush_seen_int
                 _min_col_int
               }
           }
@@ -3401,7 +3401,7 @@
 %    \begin{macrocode}
                 \bool_if:NF \g_xor_trial_failed_bool
                   {
-                    \seq_map_function:NN \g_xor_float_classes_seq  
+                    \seq_map_function:NN \g_xor_float_classes_seq
                       \xor_check_callout_constraints:n
                   }
               }
@@ -4530,7 +4530,7 @@ _1
 }
 %    \end{macrocode}
 %  \end{macro}
-%  
+%
 %
 % \begin{macro}{\xor_float_class_setup:n}
 %    \begin{macrocode}
@@ -6938,7 +6938,7 @@ _1
 % \end{macro}
 %
 % \subsection{Messages}
-% 
+%
 %    \begin{macrocode}
 \__msg_kernel_new:nnn { output } { out-of-space }
   {
@@ -6955,4 +6955,4 @@ _1
 % ^^A  \PrintIndex ^^A do not index here (at least not now)
 %
 %
- 
+
diff --git a/xpackages/xor/xo-page.dtx b/xpackages/xor/xo-page.dtx
index 86d823d..329b331 100644
--- a/xpackages/xor/xo-page.dtx
+++ b/xpackages/xor/xo-page.dtx
@@ -58,29 +58,29 @@
 %      max-float-num   = 1,
 %      ...
 %    }
-% 
-% 
-% \DeclareFloatArea {evenpage} 
+%
+%
+% \DeclareFloatArea {evenpage}
 %    {
 %      region          = t ,
 %      column          = 2 ,
 %      span            = 1 ,
-% 
+%
 %      class-close-list = {t12,t11,b11},
 %      all-close-list  = ,
 %      max-float-num   = 1,
 %      ...
 %    }
-% 
-% 
-% 
+%
+%
+%
 % \DeclareFloatArea
 %    {
 %      name-prefix     = evenpage ,
 %      region          = t ,
 %      column          = 2 ,
 %      span            = 1 ,
-% 
+%
 %      class-close-list = {t12,t11,b11},
 %      all-close-list  = ,
 %      max-float-num   = 1,
@@ -101,7 +101,7 @@
      \xor_declare_float_area:nnn {#1}{#2}{#3}
   }
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_declare_float_area:nnn #1 #2 #3 {
   \clist_put_right:Nn \g_xor_areas_known_clist{#2}
@@ -119,7 +119,7 @@
 %% \end{macro}
 
 %  \begin{macro}{\g_pagesetup_max_float_int}
-%    
+%
 %    \begin{macrocode}
 \int_new:N \g_pagesetup_max_float_int
 %    \end{macrocode}
@@ -164,7 +164,7 @@
 
   \AssignTemplateKeys
 
- % \tl_set:Nx \l_floatareasetup_area_tl 
+ % \tl_set:Nx \l_floatareasetup_area_tl
  %             {\l_floatareasetup_region_tl
  %              \l_floatareasetup_column_num
  %              \l_floatareasetup_span_num}
@@ -215,7 +215,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 %\begin{macro}{\l_pagesetup_flush_float_callout_constraint_tl}
 %\begin{macro}{\l_pagesetup_flush_float_callout_span_constraint_tl}
 %\begin{macro}{\l_pagesetup_flush_float_footnote_constraint_tl}
@@ -348,9 +348,9 @@
     \int_gset:Nn \g_pagesetup_max_float_int{3}
     \tl_set:Nn \l_pagesetup_float_callout_constraint_tl {column}
     \tl_set:Nn \l_pagesetup_float_footnote_constraint_tl {none}
-    \tl_set:Nn \l_pagesetup_flush_float_callout_constraint_tl 
+    \tl_set:Nn \l_pagesetup_flush_float_callout_constraint_tl
                 {\l_pagesetup_float_callout_constraint_tl}
-    \tl_set:Nn \l_pagesetup_flush_float_footnote_constraint_tl 
+    \tl_set:Nn \l_pagesetup_flush_float_footnote_constraint_tl
                 {\l_pagesetup_float_footnote_constraint_tl}
     \tl_set:Nn \l_pagesetup_float_callout_span_constraint_tl {flexible}
     \tl_set:Nn \l_pagesetup_flush_float_callout_span_constraint_tl
diff --git a/xpackages/xor/xo-pagestyle.dtx b/xpackages/xor/xo-pagestyle.dtx
index 50b2bc4..3e53ee0 100644
--- a/xpackages/xor/xo-pagestyle.dtx
+++ b/xpackages/xor/xo-pagestyle.dtx
@@ -69,7 +69,7 @@
 %
 % \fi
 %
-% 
+%
 %
 %
 % \title{The \textsf{xo-pagestyle} package\thanks{This file
@@ -158,7 +158,7 @@
 %       methods like |\thepage| or the mark mechanism.
 %    \item Presentation my vary according to certain aspects of the page. For
 %       some such aspects (e.g., |\IfTopFloats|) directives are available that
-%       query those aspects. They can be 
+%       query those aspects. They can be
 %       used within all instances.
 %    \end{itemize}
 %
@@ -320,21 +320,21 @@
 %
 % \end{TemplateDescription}
 %
-% 
 %
 %
-% \section{Commands} 
+%
+% \section{Commands}
 %
 % \DescribeMacro\pagestyle
 %    Interprets its argument as an instance of ``pagestylesetup'' and actives
-%    it (and the pagestyles it defines) for the current and following pages. 
-% 
+%    it (and the pagestyles it defines) for the current and following pages.
+%
 % \DescribeMacro\thispagestyle
 %    Interprets its argument as an instance of ``pagestylesetup'' and actives
 %    it (and the pagestyles it defines) for the current page only. In contrast
 %    to |\pagestyle| this is a global setting. Specifying an empty argument is
 %    equivalent to canceling any previously set up special pagestyle.
-%    
+%
 %
 % \DescribeMacro\IfTopFloatsTF
 % \DescribeMacro\IfBottomsFloatsTF
@@ -342,7 +342,7 @@
 %    floats in the respective region on the current page. Otherwise they
 %    execute their second argument.\footnote{Not yet implemented}.
 %
-% 
+%
 %
 % \StopEventually{}
 %
@@ -352,7 +352,7 @@
 %    \begin{macrocode}
 %<*package>
 %    \end{macrocode}
-%    
+%
 %
 % \subsection{User commands}
 %
@@ -423,22 +423,22 @@
 %    account at this point. This is achieved through the following code:
 %    \begin{macrocode}
 \cs_new_nopar:Npn  \xor_run_pagestyle_instance: {
-  \tl_if_empty:NTF \g_xor_this_pagestyle_tl 
+  \tl_if_empty:NTF \g_xor_this_pagestyle_tl
     { \UseInstance{pagestylesetup} \l_xor_curr_pagestyle_tl }
-    { \UseInstance{pagestylesetup} \g_xor_this_pagestyle_tl 
+    { \UseInstance{pagestylesetup} \g_xor_this_pagestyle_tl
       \tl_gclear:N \g_xor_this_pagestyle_tl
     }
 }
 \cs_set_nopar:Npn  \xor_run_pagestyle_instance: {
-  \tl_if_empty:NTF \g_xor_fpc_pagestyle_tl 
-    { 
-     \tl_if_empty:NTF \g_xor_this_pagestyle_tl 
+  \tl_if_empty:NTF \g_xor_fpc_pagestyle_tl
+    {
+     \tl_if_empty:NTF \g_xor_this_pagestyle_tl
        { \tl_gset_eq:NN \g_xor_used_pagestyle_tl \l_xor_curr_pagestyle_tl }
-       { \tl_gset_eq:NN \g_xor_used_pagestyle_tl \g_xor_this_pagestyle_tl 
+       { \tl_gset_eq:NN \g_xor_used_pagestyle_tl \g_xor_this_pagestyle_tl
 	 \tl_gclear:N \g_xor_this_pagestyle_tl
        }
     }
-    { \tl_gset_eq:NN \g_xor_used_pagestyle_tl \g_xor_fpc_pagestyle_tl 
+    { \tl_gset_eq:NN \g_xor_used_pagestyle_tl \g_xor_fpc_pagestyle_tl
       \tl_gclear:N \g_xor_fpc_pagestyle_tl
     }
 %<*trace>
@@ -452,7 +452,7 @@
 
 
 %  \begin{macro}{\g_xor_used_pagestyle_tl}
-%    
+%
 %    \begin{macrocode}
 \tl_new:N \g_xor_used_pagestyle_tl
 \tl_gset:Nn \g_xor_used_pagestyle_tl {UNDEFINED}
@@ -460,7 +460,7 @@
 %  \end{macro}
 
 %  \begin{macro}{\g_xor_fpc_pagestyle_tl}
-%    
+%
 %    \begin{macrocode}
 \tl_new:N \g_xor_fpc_pagestyle_tl
 %    \end{macrocode}
@@ -522,7 +522,7 @@
 \dim_new:N\l_xor_pagestyle_foot_offset_right_dim
 %    \end{macrocode}
 %    The calculated total width of header and footer are stored in these
-%    registers: 
+%    registers:
 %    \begin{macrocode}
 \dim_new:N\l_xor_pagestyle_head_width_dim
 \dim_new:N\l_xor_pagestyle_foot_width_dim
@@ -541,7 +541,7 @@
 %\end{macro}
 
 %  \begin{macro}{std (pagestyle)}
-%    
+%
 %    \begin{macrocode}
 \tl_new:N \l_xor_pagestyle_foot_center_tl
 \tl_new:N \l_xor_pagestyle_foot_decls_tl
@@ -561,7 +561,7 @@
   {
     inherit-from       : instance {pagestyle}  ,
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     head-decls         : function 0  =       ,
     head-left          : function 0  =       ,
@@ -570,7 +570,7 @@
     head-offset-left   : length      = 0pt   ,
     head-offset-right  : length      = 0pt   ,
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     foot-decls         : function 0  =       ,
     foot-left          : function 0  =       ,
@@ -584,16 +584,16 @@
   {
     inherit-from       =  \xor_pagestyle_inherited: ,
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     head-decls         =  \l_xor_pagestyle_head_decls_tl          ,
-    head-left          =  \l_xor_pagestyle_head_left_tl           , 
+    head-left          =  \l_xor_pagestyle_head_left_tl           ,
     head-center        =  \l_xor_pagestyle_head_center_tl         ,
-    head-right         =  \l_xor_pagestyle_head_right_tl          , 
+    head-right         =  \l_xor_pagestyle_head_right_tl          ,
     head-offset-left   =  \l_xor_pagestyle_head_offset_left_dim   ,
     head-offset-right  =  \l_xor_pagestyle_head_offset_right_dim  ,
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
     foot-decls         =  \l_xor_pagestyle_foot_decls_tl          ,
     foot-left          =  \l_xor_pagestyle_foot_left_tl           ,
@@ -609,10 +609,10 @@
 %    |\textwidth| plus the offsets on either side:
 %    \begin{macrocode}
    \dim_set:Nn \l_xor_pagestyle_head_width_dim
-      { \l_xor_pagestyle_head_offset_left_dim + \textwidth + 
+      { \l_xor_pagestyle_head_offset_left_dim + \textwidth +
         \l_xor_pagestyle_head_offset_right_dim }
    \dim_set:Nn \l_xor_pagestyle_foot_width_dim
-      { \l_xor_pagestyle_foot_offset_left_dim + \textwidth + 
+      { \l_xor_pagestyle_foot_offset_left_dim + \textwidth +
         \l_xor_pagestyle_foot_offset_right_dim }
 %    \end{macrocode}
 %    Finally the template has to define the commands
@@ -643,7 +643,7 @@
 
      \rlap { \tabular [#3]{@{}l} #5 \endtabular }
      \hfill
-     \tabular [#3]{@{}c} #6 \endtabular 
+     \tabular [#3]{@{}c} #6 \endtabular
      \hfill
      \llap { \tabular [#3]{r@{}} #7 \endtabular }
     }
@@ -659,7 +659,7 @@
 %    Commands to build the running header / footer in the template |std|.
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_generate_running_head_std: {
-   \xor_generate_running_box:nnnnnnnn 
+   \xor_generate_running_box:nnnnnnnn
       { \null\hskip -\l_xor_pagestyle_head_offset_left_dim }
       \l_xor_pagestyle_head_width_dim
       {b}
@@ -670,7 +670,7 @@
       {}
 }
 \cs_new_nopar:Npn \xor_generate_running_foot_std: {
-   \xor_generate_running_box:nnnnnnnn 
+   \xor_generate_running_box:nnnnnnnn
       { \null\hskip -\l_xor_pagestyle_foot_offset_left_dim }
       \l_xor_pagestyle_foot_width_dim
       {t}
@@ -688,7 +688,7 @@
 %
 %
 %  \begin{macro}{std (pagestylesetup)}
-%    
+%
 %    \begin{macrocode}
 \DeclareTemplateInterface{pagestylesetup}{std}{0}
   {
@@ -740,8 +740,8 @@
 %  \end{macro}
 %
 %
-%    
-%    
+%
+%
 % \section{Default instances}
 %
 % \subsection{Pagestyle setup}
@@ -766,12 +766,12 @@
      regularpage-even = headings-page-even
    }
 %    \end{macrocode}
-%    
-%    
-%    
+%
+%
+%
 % \subsection{Single pagestyles}
 %
-%    The following single pagestyles implement the \LaTeXe{} defaults. 
+%    The following single pagestyles implement the \LaTeXe{} defaults.
 %    \begin{macrocode}
 \DeclareInstance{pagestyle}{empty}{std}{}
 %    \end{macrocode}
@@ -796,13 +796,13 @@
     head-right = \slshape \LastMark{leftmark} ,
    }
 %    \end{macrocode}
-%    
-%    
-%    
-%    
-%    
-%    
-%    
+%
+%
+%
+%
+%
+%
+%
 % \subsection{Tests}
 %
 %    Stuff here doesn't really belong to the package, it is only there to have
@@ -861,7 +861,7 @@
         #1}}
 
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
diff --git a/xpackages/xor/xo-pfloat.tex b/xpackages/xor/xo-pfloat.tex
index 8183c12..16065be 100644
--- a/xpackages/xor/xo-pfloat.tex
+++ b/xpackages/xor/xo-pfloat.tex
@@ -18,7 +18,7 @@
 \else
 %  \input protcode.tex
 %  \pdfprotrudechars=2
-%  \pdfoutput=0             
+%  \pdfoutput=0
 \fi
 
 \tolerance=6000
@@ -151,7 +151,7 @@
    numbered-id        = figure,
    numbered-within-id = ,
    numbered-action    = \arabic{figure},
-   body-decls         = 
+   body-decls         =
   }
 
 
@@ -241,7 +241,7 @@
 %
    footnote-setup = \UseTemplate{footnotesetup}{ftnright}{},
 %   footnote-setup = \UseTemplate{footnotesetup}{ftnrightspread}{},
-%   footnote-setup = \UseTemplate{footnotesetup}{multicolumn}{column-num=1}, 
+%   footnote-setup = \UseTemplate{footnotesetup}{multicolumn}{column-num=1},
 %   footnote-setup = \UseTemplate{footnotesetup}{margin}{},
 %   footnote-setup = \UseTemplate{footnotesetup}{std}{},
 %
@@ -249,7 +249,7 @@
    float-area-sep  = 20pt,
    float-float-sep = 20pt,
 %
-   grid-point-sep = 12pt,     
+   grid-point-sep = 12pt,
   }
 \fi
 
@@ -345,7 +345,7 @@ straightforward since some activities are very much faster than
 others.  For example, performing a test by using a reasonable number
 of macro expansions and register assignments may be very much slower
 than running through a long typeset list and then doing a simple test.
- 
+
 
 The algorithm we have implemented fulfills the requirement of being
 (essentially) linear in the number of floats and the number of float
@@ -357,7 +357,7 @@ areas.
 The document source is a single stream of continuous text containing
 call-outs to floating objects. (At the moment the call-outs are marked
 by placing the objects into the stream but it would be possible to
-provide them as separate objects.) 
+provide them as separate objects.)
 Floating objects (as of today) come in three incarnations:
 \begin{itemize}
 \item Objects where the call-out and the placement requires a strict
@@ -403,7 +403,7 @@ headings, lists, and other ``display'' objects are not aligned.}
 The page layouts which are supported by the new algorithm support
 an arbitrary number of text columns of equal width.
 
-\tracefloats 
+\tracefloats
 \tracingmarks=2
 
 \begin{figure}[h]
@@ -415,7 +415,7 @@ an arbitrary number of text columns of equal width.
 \]
 or
 \[
-   pij  \textrm{ with }   i \leq c+s < i+j \leq 
+   pij  \textrm{ with }   i \leq c+s < i+j \leq
                             \mbox{\meta{number-of-columns}}
 \]
 \end{minipage}
@@ -440,7 +440,7 @@ rectangular in shape. Float areas span one or more text columns, their
 horizontal size is therefore given by the following formula (where
 $c$ is the number of columns spanned):
 \[
-   \meta{area-width} =  c \times 
+   \meta{area-width} =  c \times
                         \bigl( \meta{col-width} + \meta{col-sep}\bigr)
                         - \meta{col-sep}
 \]
@@ -454,7 +454,7 @@ digit denoting the number of columns to span. The
 \meta{start-column} is a single digit\footnote{With a bit of care in
 the code this could be extended to allow more than one digit.}
 denoting the start column of the area. Thus |t23| is a top area
-starting at column two and spanning three columns, i.e., two, three 
+starting at column two and spanning three columns, i.e., two, three
 and four.
 A restriction due to the naming scheme is that currently no more than
 9 columns are possible.\footnote{The scheme is different from the
@@ -469,7 +469,7 @@ that result in ``splitting'' the text of a column due to a float (other
 than column `here' floats).\footnote{Perhaps this restriction will be
 lifted one day.} This means that population of some float areas
 must be prevented, namely those satisfying these conditions
-when $pcs$ (where $p=\textrm{pos}$, 
+when $pcs$ (where $p=\textrm{pos}$,
 $c=\textrm{column}$, $s=\textrm{span}$) has just been populated:
 
 \begin{figure}[h]
@@ -481,7 +481,7 @@ $c=\textrm{column}$, $s=\textrm{span}$) has just been populated:
 \]
 or
 \[
-   pij  \textrm{ with }   i \leq c+s < i+j \leq 
+   pij  \textrm{ with }   i \leq c+s < i+j \leq
                             \mbox{\meta{number-of-columns}}
 \]
 \end{minipage}
@@ -585,7 +585,7 @@ have to appear on the same page as their call-outs.
 In its current version, the model supports footnotes beneath the
 call-out column (normal behavior); all footnotes in the last column
 (as with the \texttt{ftnright} package for two-column mode); all
-footnotes in the outer (or inner) margin. 
+footnotes in the outer (or inner) margin.
 
 Without an extension to the page makeup algorithm (but instead with a
 suitable redefinition of the footnote commands) they could be processed
@@ -631,7 +631,7 @@ further trials will be based on adding to this solution (no
 backtracking). If the algorithm fails to place the float into any
 area it means that the float will be deferred to a later page.
 
-As floats are added to areas, the constraints for further trials 
+As floats are added to areas, the constraints for further trials
 are changed. There are several reasons for this:
 on one hand, the call-out positions of
 various floats move
@@ -671,7 +671,7 @@ various information about the float positioning trial, such as the
 area to format it into, the fact that it formats onto a verso or recto
 page, etc. It might try several possibilities before making a decision,
 e.g., if one formatting of the float results in violating some
-constraint(s) it might try a different formatting at 
+constraint(s) it might try a different formatting at
 this point.
 
 
@@ -763,7 +763,7 @@ At the moment the following behaviour can be specified:
 \begin{description}
 \item[strict] which means that the leftmost column spanned
   by the float is being regarded as the column in which the float was placed.
-\item[flexible] which means that the rightmost column spanned 
+\item[flexible] which means that the rightmost column spanned
   by the float is being regarded as the column in which the float was placed.
 \end{description}
 These settings are only relevant if the main float/call-out relations
@@ -774,7 +774,7 @@ are set to |column| or |after|.
 
 It is possible to direct the algorithm to check on each column if
 there are footnotes, and if so to prevent it from placing floats in
-the bottom 
+the bottom
 area. In theory it might be possible that a forbidden constellation
 might resolve itself once the algorithm has added further floats,
 e.g., it could be the case that by adding additional floats the
@@ -1070,7 +1070,7 @@ Float: \bx at F   {6}  {table} (floats)  {6}   {Running times of the algorithm}
  area trial: b11  -> failed: b11 float num reached (1)
  area trial: b21  -> failed: area below flush point (2=2, b21)
  -> failed: --> retry with relaxed conditions
- 
+
  area trial: b12  -> failed: span count b12 /= 1
  area trial: b11  -> accepted
  STATS: trials = 7
@@ -1107,7 +1107,7 @@ In the class file the designer is given control over the algorithm's
 behavior in all the aspects described above (and several more).
 
 The layout specifications are done through the new template and
-instance concept, see~\cite{tub:MCR99-3}. 
+instance concept, see~\cite{tub:MCR99-3}.
 Additional information such as experimental code, further
 documentation, etc.\ can
 be found on the \LaTeX{} project web site at:
@@ -1118,7 +1118,7 @@ be found on the \LaTeX{} project web site at:
 In contrast to the algorithm itself, which in its basic functionality
 now seems to be stable and reliable, the design interface is far
 more experimental. Thus the example declarations given below represent
-only the current state of thought (or of implementation) 
+only the current state of thought (or of implementation)
 and are likely to be modified at any moment.
 
 
@@ -1137,7 +1137,7 @@ properties of the float type, e.g.,
      numbered-boolean   = true,
      numbered-id        = figure,
      numbered-within-id = section,
-     numbered-action    = 
+     numbered-action    =
           \thesection.\arabic{figure},
      body-decls         = ,
     }
@@ -1206,7 +1206,7 @@ floats it is allowed to receive (\texttt{max-float-num}) and through
 two lists which tell the algorithm which other areas are affected by
 adding a float to the current area. The list \texttt{class-close-list}
 enumerates all areas which are not allowed to receive additional
-floats of the same sequence class as the float that has been placed 
+floats of the same sequence class as the float that has been placed
 into the current area, while
 the list \texttt{all-close-list} contains the information about all
 areas that are to be completely closed the moment a float is received
@@ -1274,7 +1274,7 @@ unnamed instances there using the |\UseTemplate| method.
 
 At the heart of the layout declaration are instances of the type
 |pagesetup2.|\footnote{The number 2 has historical reasons and will
-vanish again at some point in the future.} 
+vanish again at some point in the future.}
 An example setup showing all currently available keys is given in
 %
 \ifnum\ProcessControl=0
@@ -1317,7 +1317,7 @@ An example setup showing all currently available keys is given in
      float-inline-sep    = 6pt minus 2pt,
 % grid specification
      grid-point-sep      = 12pt,
-% footnote etc specification 
+% footnote etc specification
      footnote-setup                         = mainmatter,
     }
 \end{verbatim}
@@ -1343,7 +1343,7 @@ The following four keys define the standard constraints for the
 algorithm when placing floats: \texttt{max-\allowbreak
 float-\allowbreak num} is the maximum number of floats that can go on
 a normal page,
-\texttt{float-\allowbreak callout-\allowbreak constraint} defines 
+\texttt{float-\allowbreak callout-\allowbreak constraint} defines
 what kind of relations between float and call-out are allowed,
 possible values are explained on~\vpageref{fl-callout-relations}.
 
@@ -1352,7 +1352,7 @@ constraint} handles the interpretation of spanning floats and is
 explained on~\vpageref{fl-span-relation}, and
 \texttt{bottom-\allowbreak float-\allowbreak footnote-\allowbreak
 constraint} defines whether or not bottom floats are allowed in case
-of footnotes. 
+of footnotes.
 
 The last three constraints are replaced by
 \texttt{flush-\allowbreak float-\allowbreak callout-\allowbreak
@@ -1367,7 +1367,7 @@ float-\allowbreak num} is disregarded in that case automatically).
 
 The key |area-list| defines all float areas that are allowed in this
 page layout as well as defining the order in which the areas are tried
-when placing floats.  
+when placing floats.
 The keys \texttt{defer-class-close-list} and
 \texttt{defer-all-close-list} define the ``closing actions'' for the
 special area which receives the floats that could not be placed. E.g.,
@@ -1482,7 +1482,7 @@ and |t22| where the captions are set to the side.
 
 To test the performance of the algorithm we prepared a somewhat
 ridiculous test file containing three types of floats (``figures'',
-``tables'', and ``algorithms'') with a total number of 47 floats. 
+``tables'', and ``algorithms'') with a total number of 47 floats.
 The chosen
 layout had 3 columns and 11 potential float areas.  Figure captions
 have been placed below the float while with tables and algorithms the
@@ -1497,7 +1497,7 @@ ten floats was allowed per page, i.e., roughly three per column.
 Since the document contained many floats early on (24 on page one) and
 the first of these was especially constructed to be not placeable the
 first time around, the algorithm had to work hard to place all the
-dangling floats. Table~\vref{tab:stats} 
+dangling floats. Table~\vref{tab:stats}
 %
 \begin{table}
 \footnotesize
@@ -1543,7 +1543,7 @@ evaluate). Note that on the third page the algorithm was able to
 produce a float page, on all other pages the float page trial was
 unsuccessful.
 
-Table~\vref{tab:runs} shows the running times 
+Table~\vref{tab:runs} shows the running times
 %
 \begin{table}
 \footnotesize
diff --git a/xpackages/xor/xo-place.dtx b/xpackages/xor/xo-place.dtx
index e5b3e91..925cdee 100644
--- a/xpackages/xor/xo-place.dtx
+++ b/xpackages/xor/xo-place.dtx
@@ -128,7 +128,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-        \int_compare:nNnTF 
+        \int_compare:nNnTF
           {\int_use:c {g_xor_area_ \g_xor_this_area_name_tl  _max_float_int} }
         = {\int_use:c {g_xor_area_ \g_xor_this_area_name_tl  _float_int } }
         {
@@ -172,7 +172,7 @@
                  \g_xor_this_area_name_tl
                  {
 %<*trace>
-                   \trace:n{area~ closed~ for~ class~ \g_xor_this_class_tl;~ 
+                   \trace:n{area~ closed~ for~ class~ \g_xor_this_class_tl;~
                           member~ of~  (\g_xor_this_areas_closed_clist)}
 %</trace>
 %<*progress>
@@ -183,12 +183,12 @@
                  }
                  {
 %<*trace>
-                  \trace:n{area~ open~ for~ class~ \g_xor_this_class_tl;~ 
+                  \trace:n{area~ open~ for~ class~ \g_xor_this_class_tl;~
                          not~ member~ of~
                          (\g_xor_this_areas_closed_clist)}
 %</trace>
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
                   \clist_if_in:NoTF
                     \g_xor_this_allowed_areas_clist
@@ -196,13 +196,13 @@
                     {
                       \xor_append_caption_to_float:
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 %                      \tl_set:Nn \l_tmpa_tl {c}
-%                      \tl_if_eq:NNTF \l_tmpa_tl \g_xor_this_area_type_tl 
+%                      \tl_if_eq:NNTF \l_tmpa_tl \g_xor_this_area_type_tl
                       \xor_if_this_area_type:NTF {c}
                        {
-			 \xor_attempt_float_col:NN 
+			 \xor_attempt_float_col:NN
                               \g_xor_this_area_col_tl
                               \g_xor_this_area_span_tl
 			 \bool_if:NTF \g_test_bool
@@ -218,12 +218,12 @@
                     }
                     {
 %<*trace>
-                      \trace:n{close~area:~\g_xor_this_area_name_tl\space 
+                      \trace:n{close~area:~\g_xor_this_area_name_tl\space
                              float~not~allowed~
                              by~ user~ control~ (\g_xor_this_allowed_areas_clist)}
 %</trace>
 %<*progress>
-                      \xor_progress_failed:n{\g_xor_this_area_name_tl\space 
+                      \xor_progress_failed:n{\g_xor_this_area_name_tl\space
                              float~not~allowed~
                              by~ user~ control~ (\g_xor_this_allowed_areas_clist)}
 %</progress>
@@ -268,14 +268,14 @@
 %
 
 %  \begin{macro}{\xor_attempt_float_col:NN}
-%    
+%
 %    \begin{macrocode}
 \cs_new_nopar:Npn \xor_attempt_float_col:NN  #1 #2 {
 %<*trace>
   \trace_push:n{xor_attempt_float_col:NN ~#1/#2}
 %</trace>
 
-  \seq_gset_eq:NN \g_xor_saved_floats_active_seq 
+  \seq_gset_eq:NN \g_xor_saved_floats_active_seq
                   \g_xor_floats_active_seq
 
   \tl_gset_eq:NN \g_xor_saved_curr_float_box_tl
@@ -285,12 +285,12 @@
 
 %%%% next block unfinished/broken
   \dim_set_eq:Nc \l_xor_fcol_target_dim
-           {g_xor_ht_col_ 
-            \int_use:N \l_xor_update_col_int 
+           {g_xor_ht_col_
+            \int_use:N \l_xor_update_col_int
             _
             \xor_if_this_area_type:NTF {b}
-              {\int_use:c{g_xor_col_ 
-                          \int_use:N \l_xor_update_col_int 
+              {\int_use:c{g_xor_col_
+                          \int_use:N \l_xor_update_col_int
                           _block_int}}
               {1}
             _dim }
@@ -299,7 +299,7 @@
   \bool_until_do:nn
     { \seq_if_empty_p:N \g_xor_floats_active_seq }
     {
-     \seq_gpop:NN \g_xor_floats_active_seq 
+     \seq_gpop:NN \g_xor_floats_active_seq
                   \l_tmpa_tl
 
   \tl_gset_eq:NN \g_xor_curr_float_box_tl
@@ -310,8 +310,8 @@
     }
 
   \seq_gset_eq:NN \g_xor_floats_active_seq
-                  \g_xor_saved_floats_active_seq 
-     
+                  \g_xor_saved_floats_active_seq
+
   \tl_gset_eq:NN \g_xor_curr_float_box_tl
                   \g_xor_saved_curr_float_box_tl
 
@@ -408,7 +408,7 @@
           \g_xor_this_area_name_tl
         {
 %<*trace>
-          \trace:n{area~ closed~ for~ class~ \g_xor_this_class_tl;~ 
+          \trace:n{area~ closed~ for~ class~ \g_xor_this_class_tl;~
                  member~ of~
                  (\g_xor_this_areas_closed_clist)}
 %</trace>
@@ -420,16 +420,16 @@
         }
         {
 %<*trace>
-          \trace:n{area~ open~ for~ class~ \g_xor_this_class_tl;~ 
+          \trace:n{area~ open~ for~ class~ \g_xor_this_class_tl;~
                  not~ member~ of~
                  (\g_xor_this_areas_closed_clist)}
 %</trace>
           \xor_append_caption_to_float:
 %         \tl_set:Nn \l_tmpa_tl {c}
-%         \tl_if_eq:NNTF \l_tmpa_tl \g_xor_this_area_type_tl 
+%         \tl_if_eq:NNTF \l_tmpa_tl \g_xor_this_area_type_tl
           \xor_if_this_area_type:NTF {c}
             {
-             \xor_attempt_float_col:NN 
+             \xor_attempt_float_col:NN
                  \g_xor_this_area_col_tl
                  \g_xor_this_area_span_tl
              \bool_if:NTF \g_test_bool
@@ -586,7 +586,7 @@
 %%    \begin{macrocode}
 %  \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl < \g_xor_returned_delta_size_tl
 %  {
-%    \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl 
+%    \dim_compare:nNnT \g_xor_returned_lower_delta_size_tl
 %                    < \g_xor_float_text_shrink_dim
 %    {
 %%<*trace>
@@ -649,7 +649,7 @@
 %%    \begin{macrocode}
 %    \xor_if_this_area_type:NT {b}
 %     {
-%      \dim_gset:cn {g_xor_saved_bottom_ht_col_#2_dim} 
+%      \dim_gset:cn {g_xor_saved_bottom_ht_col_#2_dim}
 %                   {\dim_use:c{g_xor_bottom_ht_col_#2_dim}}
 %      \dim_gadd:cn{g_xor_bottom_ht_col_#2_dim}\l_tmpa_dim
 %%<*trace>
@@ -740,7 +740,7 @@
 %  \begin{macro}{\g_xor_returned_lower_size_tl}
 %  \begin{macro}{\g_xor_returned_delta_size_tl}
 %  \begin{macro}{\g_xor_returned_lower_delta_size_tl}
-%    
+%
 %    \begin{macrocode}
 \tl_new:N\g_xor_returned_size_tl
 \tl_new:N\g_xor_returned_lower_size_tl
@@ -858,7 +858,7 @@
 %  Check if  |#2| is a multiple of |#1|.
 %    \begin{macrocode}
   \int_compare:nNnTF
-    { \int_mod:nn {#1} {#2} }  = \c_zero 
+    { \int_mod:nn {#1} {#2} }  = \c_zero
 %    \end{macrocode}
 %  If it is, things are easy.
 %    \begin{macrocode}
@@ -916,7 +916,7 @@
 %</progress>
       \seq_gput_right:No \g_xor_area_DDD_float_seq \g_xor_this_float_box_tl
 %<*trace>
-      \trace:n{g_xor_curr_page_areas_closed_clist~ <-~ 
+      \trace:n{g_xor_curr_page_areas_closed_clist~ <-~
              "\g_xor_curr_page_areas_closed_clist"~ +~
              "\g_xor_area_DDD_all_close_clist"}
 %</trace>
@@ -930,12 +930,12 @@
         \trace:n{g_xor_this_areas_closed_clist~ <-~
                "\g_xor_area_DDD_class_close_clist"~ (all~ closed)}
 %</trace>
-        \clist_gset_eq:NN \g_xor_this_areas_closed_clist 
+        \clist_gset_eq:NN \g_xor_this_areas_closed_clist
                           \g_xor_area_DDD_class_close_clist
       }
       {
 %<*trace>
-        \trace:n{g_xor_this_areas_closed_clist~ <-~ 
+        \trace:n{g_xor_this_areas_closed_clist~ <-~
                "\g_xor_this_areas_closed_clist"~ +~
                "\g_xor_area_DDD_class_close_clist"}
 %</trace>
@@ -1082,15 +1082,15 @@
           \xor_do_next:N\xor_really_defer_and_try_next_float:
         }
 %    \end{macrocode}
-%    Once a |\g_xor_flush_NUM_min_col_int| is larger 
+%    Once a |\g_xor_flush_NUM_min_col_int| is larger
 %    than |\g_xor_curr_col_int| it has
 %    moved to the next page. In particular this is true for the
 %    artificial value |\maxdimen| to which it is sometimes set to
 %    denote this fact. If so we can defer our float.
 %    \begin{macrocode}
         {
-          \int_compare:nNnTF { \int_use:c{g_xor_flush_ 
-                                          \int_use:N \count@ 
+          \int_compare:nNnTF { \int_use:c{g_xor_flush_
+                                          \int_use:N \count@
                                           _min_col_int }}
                              > \g_xor_curr_col_int
           {
@@ -1357,23 +1357,23 @@
 %    We store in |\g_xor_flseq_max_int| the highest sequence number for floats of
 %    the current type up to the end of the page. For this we have to
 %    find the maximum of |\g_xor_flseq_type_|\meta{type}|_col_0_int| (highest
-%    float number on 
+%    float number on
 %    previous pages) and those for the columns, e.g.,
 %    |\g_xor_flseq_type_|\meta{type}|_col_|\meta{column}|_int|; this is done
-%    by the following 
+%    by the following
 %    code:
 %    \begin{macrocode}
     \int_gset_eq:Nc \g_xor_flseq_max_int
                     { g_xor_flseq_type_#1_col_0_int }
     \xor_forall_columns:n {
-      \int_compare:nNnT {\int_use:c{g_xor_flseq_type_#1_col_ 
-                                    \int_use:N \g_xor_curr_col_int 
+      \int_compare:nNnT {\int_use:c{g_xor_flseq_type_#1_col_
+                                    \int_use:N \g_xor_curr_col_int
                                     _int} }
                         > \g_xor_flseq_max_int
       {
-         \int_gset_eq:Nc \g_xor_flseq_max_int 
-                         { g_xor_flseq_type_#1_col_ 
-                          \int_use:N \g_xor_curr_col_int 
+         \int_gset_eq:Nc \g_xor_flseq_max_int
+                         { g_xor_flseq_type_#1_col_
+                          \int_use:N \g_xor_curr_col_int
                           _int }
       }
     }
@@ -1458,7 +1458,7 @@
 %    correct behaviour as any callouts that might be present will be
 %    correctly evaluated in tests on neighboring columns with floats.
 %    \begin{macrocode}
-  \int_compare:nNnTF \count@< {\int_use:c{g_xor_flseq_type_#1_col_ 
+  \int_compare:nNnTF \count@< {\int_use:c{g_xor_flseq_type_#1_col_
                                           \int_use:N \g_xor_curr_col_int
                                           _int}}
   {
@@ -1506,7 +1506,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\g_xor_flseq_returned_int}
 %    \begin{macrocode}
 \int_new:N \g_xor_flseq_returned_int
@@ -1526,7 +1526,7 @@
 %    We first check if all floats are either on the same column than
 %    their callout or on an later column by calling
 %    |\xor_check_callout_column:n|. If this returns true (in
-%    |\g_xor_trial_failed_bool|) we immediately 
+%    |\g_xor_trial_failed_bool|) we immediately
 %    abort any further processing.
 %    \begin{macrocode}
   \xor_check_callout_column:n{#1}
@@ -1645,7 +1645,7 @@
 %    being templated.}
 %    \begin{macrocode}
 %  \box_if_empty:NF \g_xor_footins_box
-  \bool_if:nF 
+  \bool_if:nF
      { \box_if_empty_p:N \g_xor_footins_box &&
        \box_if_empty_p:N \g_xor_saved_footins_box }
   {
@@ -1676,8 +1676,8 @@
         {
 %<*progress>
           \xor_progress_failed:n{old~bottom~floats:~
-          \cs_meaning:c{g_xor_area_ 
-                        b\int_use:N\g_xor_curr_col_int 1 
+          \cs_meaning:c{g_xor_area_
+                        b\int_use:N\g_xor_curr_col_int 1
                         _float_seq}}
 %</progress>
 %<*trace>
diff --git a/xpackages/xor/xotrace.ins b/xpackages/xor/xotrace.ins
index 646b5a4..c13cb40 100644
--- a/xpackages/xor/xotrace.ins
+++ b/xpackages/xor/xotrace.ins
@@ -15,7 +15,7 @@
 %%
 %% This file is part of the ``xor bundle'' (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
-%% 
+%%
 %% The released version of this bundle is available from CTAN.
 %%
 %% -----------------------------------------------------------------------
@@ -27,7 +27,7 @@
 %% for those people who are interested.
 %%
 %%%%%%%%%%%
-%% NOTE: %% 
+%% NOTE: %%
 %%%%%%%%%%%
 %%
 %%   Snapshots taken from the repository represent work in progress and may
diff --git a/xpackages/xor/xoutput.tex b/xpackages/xor/xoutput.tex
index d5bdb41..0d58b1c 100644
--- a/xpackages/xor/xoutput.tex
+++ b/xpackages/xor/xoutput.tex
@@ -23,7 +23,7 @@
 %% for those people who are interested.
 %%
 %%%%%%%%%%%
-%% NOTE: %% 
+%% NOTE: %%
 %%%%%%%%%%%
 %%
 %%   Snapshots taken from the repository represent work in progress and may

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the latex3-commits mailing list