From 28dc7605d7875058227c5690a8f6354e1979d1b5 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Fri, 6 Nov 2015 00:17:32 +0100
Subject: [doc] remove redundant namespace prefixing for primitives

---
 doc/luaotfload-latex.tex | 18 +++++++++---------
 doc/luaotfload-main.tex  | 40 ++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'doc')

diff --git a/doc/luaotfload-latex.tex b/doc/luaotfload-latex.tex
index 9f09f4f..32ad3cb 100644
--- a/doc/luaotfload-latex.tex
+++ b/doc/luaotfload-latex.tex
@@ -220,9 +220,9 @@
 \newcount \othercatcode  \othercatcode 12
 \newcount \activecatcode \othercatcode 13
 
-\newluatexcatcodetable \vrbcatcodes
-\setluatexcatcodetable \vrbcatcodes {%
-  \luatexcatcodetable \CatcodeTableIniTeX
+\newcatcodetable \vrbcatcodes
+\setcatcodetable \vrbcatcodes {%
+  \catcodetable \CatcodeTableIniTeX
   \catcode  9 \othercatcode %% \tabasciicode
   \catcode 13 \othercatcode %% \endoflineasciicode
   \catcode 12 \othercatcode %% \formfeedasciicode
@@ -230,22 +230,22 @@
   \catcode 32 \othercatcode %% \spaceasciicode
 }
 
-\newluatexcatcodetable \literalcatcodes
-\setluatexcatcodetable \literalcatcodes {%
-  \luatexcatcodetable \CatcodeTableString
+\newcatcodetable \literalcatcodes
+\setcatcodetable \literalcatcodes {%
+  \catcodetable \CatcodeTableString
   \catcode 32 \activecatcode %% \spaceasciicode
 }
 
 \def \beginlisting {%
   \begingroup
-    \luatexcatcodetable \vrbcatcodes
+    \catcodetable \vrbcatcodes
     \beginlistingindeed%
 }
 
 \directlua {
   local texprint   = tex.print
   local stringsub  = string.sub
-  local backslash  = string.byte (0x5c)
+  local backslash  = string.char (0x5c)
   document         = document or { }
   document.printlines = function (buffer)
     for _, line in next, string.explode (buffer, "\noexpand\n") do
@@ -266,7 +266,7 @@
     \begin {quote}
       \bgroup
         \addfontfeature {RawFeature=-tlig;-liga}%% So one can’t just turn them all off at once using the ``Ligatures`` key?
-        \luatexcatcodetable \literalcatcodes
+        \catcodetable \literalcatcodes
         \obeyspaces
         \obeylines
         \directlua{document.printlines ([==[\detokenize {#1}]==])}
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index 46f66b5..7badffd 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -1116,31 +1116,31 @@ libraries.
 During a \TEX\ run, the fontloader initialization and injection happens
 in the module \fileent{luaotfload-init.lua}.
 
-A number of \emphasis{\LUA utility libraries} that are already provided
-by \identifier{lualibs} package are not part of the \identifier{luaotfload}
-fontloader.\footnote{%
+A number of \emphasis{\LUA utility libraries} are not part of the
+\identifier{luaotfload} fontloader, contrary to its equivalent in
+\LUATEX-Fonts. These are already provided by the \identifier{lualibs}
+and have thus been omitted from the merge.\footnote{%
   Faithful listeners will remember the pre-2.6 era when the fontloader
   used to be integrated as-is which caused all kinds of code
-  duplication with the pervasive \identifier{Lualibs} package.
+  duplication with the pervasive \identifier{lualibs} package.
   This conceptual glitch has since been amended by tightening the
   coupling with the excellent \CONTEXT\ toolchain.
 }
-\beginnarrower
-  \begindoublecolumns
-    \begindefinitions
-        \beginaltitem {l-lua.lua}       \endaltitem
-        \beginaltitem {l-lpeg.lua}      \endaltitem
-        \beginaltitem {l-function.lua}  \endaltitem
-        \beginaltitem {l-string.lua}    \endaltitem
-        \beginaltitem {l-table.lua}     \endaltitem
-        \beginaltitem {l-io.lua}        \endaltitem
-        \beginaltitem {l-file.lua}      \endaltitem
-        \beginaltitem {l-boolean.lua}   \endaltitem
-        \beginaltitem {l-math.lua}      \endaltitem
-        \beginaltitem {util-str.lua}    \endaltitem
-    \enddefinitions
-  \enddoublecolumns
-\endnarrower
+
+\begindoublecolumns
+  \begindefinitions
+      \beginaltitem {l-lua.lua}       \endaltitem
+      \beginaltitem {l-lpeg.lua}      \endaltitem
+      \beginaltitem {l-function.lua}  \endaltitem
+      \beginaltitem {l-string.lua}    \endaltitem
+      \beginaltitem {l-table.lua}     \endaltitem
+      \beginaltitem {l-io.lua}        \endaltitem
+      \beginaltitem {l-file.lua}      \endaltitem
+      \beginaltitem {l-boolean.lua}   \endaltitem
+      \beginaltitem {l-math.lua}      \endaltitem
+      \beginaltitem {util-str.lua}    \endaltitem
+  \enddefinitions
+\enddoublecolumns
 
 The reference fontloader is home to several \LUA files that can be
 grouped twofold as below:
-- 
cgit v1.2.3