[latex3-commits] [git/LaTeX3-latex3-latex3] master: Harmonize how we write logos (106af1c)
Bruno Le Floch
bruno at le-floch.fr
Sat Apr 14 16:27:19 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/106af1c79addf52c1d69dff9da78e1819b199e64
>---------------------------------------------------------------
commit 106af1c79addf52c1d69dff9da78e1819b199e64
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Sat Apr 14 10:27:19 2018 -0400
Harmonize how we write logos
>---------------------------------------------------------------
106af1c79addf52c1d69dff9da78e1819b199e64
l3experimental/l3str/l3str-convert.dtx | 8 ++++----
l3kernel/expl3.dtx | 2 +-
l3kernel/l3bootstrap.dtx | 4 ++--
l3kernel/l3doc.dtx | 1 +
l3kernel/l3drivers.dtx | 2 +-
l3kernel/l3file.dtx | 6 +++---
l3kernel/l3final.dtx | 2 +-
l3kernel/l3fp-expo.dtx | 2 +-
l3kernel/l3names.dtx | 12 ++++++------
l3kernel/l3regex.dtx | 4 ++--
l3kernel/l3sort.dtx | 4 ++--
l3packages/xparse/xparse.dtx | 2 +-
l3trial/l3auxdata/l3auxdata.dtx | 2 +-
l3trial/l3htoks/l3htoks.dtx | 4 ++--
l3trial/xfont/l3font.dtx | 2 +-
15 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/l3experimental/l3str/l3str-convert.dtx b/l3experimental/l3str/l3str-convert.dtx
index 77692a5..a349824 100644
--- a/l3experimental/l3str/l3str-convert.dtx
+++ b/l3experimental/l3str/l3str-convert.dtx
@@ -150,7 +150,7 @@
% in Tables~\ref{tab:encodings} and~\ref{tab:escapings}, respectively.
% The default escaping is to input and output bytes directly. The
% special case of an empty \meta{name} indicates the use of
-% \enquote{native} strings, 8-bit for pdf\TeX{}, and Unicode strings
+% \enquote{native} strings, 8-bit for \pdfTeX{}, and Unicode strings
% for the other two engines.
%
% For example,
@@ -1308,11 +1308,11 @@
% \begin{itemize}
% \item \texttt{bytes} (default), non-bytes are filtered out, and
% bytes are left untouched (this is defined by default);
-% \item \texttt{hex} or \texttt{hexadecimal}, as per the pdf\TeX{}
+% \item \texttt{hex} or \texttt{hexadecimal}, as per the \pdfTeX{}
% primitive \tn{pdfescapehex}
-% \item \texttt{name}, as per the pdf\TeX{} primitive
+% \item \texttt{name}, as per the \pdfTeX{} primitive
% \tn{pdfescapename}
-% \item \texttt{string}, as per the pdf\TeX{} primitive
+% \item \texttt{string}, as per the \pdfTeX{} primitive
% \tn{pdfescapestring}
% \item \texttt{url}, as per the percent encoding of urls.
% \end{itemize}
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index f584951..628d3cf 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -999,7 +999,7 @@
% \item \pdfTeX{} v1.40 or later.
% \item \XeTeX{} v0.9994 or later.
% \item \LuaTeX{} v0.70 or later.
-% \item e-(u)p\TeX{} mid-2012 or later.
+% \item e-(u)\pTeX{} mid-2012 or later.
% \end{itemize}
%
% Additional modules beyond the core of \pkg{expl3} may require additional
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index 63e80a9..bb3d196 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -505,7 +505,7 @@
\begingroup
% \end{macrocode}
% Lower case chars: map to themselves when lower casing and down by |"20| when
-% upper casing. (The characters |a|--|z| are set up correctly by Ini\TeX{}.)
+% upper casing. (The characters |a|--|z| are set up correctly by \IniTeX{}.)
% \begin{macrocode}
\def\temp{%
\ifnum\count0>\count2 %
@@ -525,7 +525,7 @@
% \end{macrocode}
% Upper case chars: map up by |"20| when lower casing, to themselves when upper
% casing and require an \tn{sfcode} of $999$. (The characters |A|--|Z| are set
-% up correctly by Ini\TeX{}.)
+% up correctly by \IniTeX{}.)
% \begin{macrocode}
\def\temp{%
\ifnum\count0>\count2 %
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index b0116b5..471014a 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1660,6 +1660,7 @@ and all files in that bundle must be distributed together.
\providecommand*\upTeX{up\kern-.2em\hologo{TeX}}
\providecommand*\epTeX{$\varepsilon$-\pTeX}
\providecommand*\eupTeX{$\varepsilon$-\upTeX}
+\providecommand*\ConTeXt{\hologo{ConTeXt}}
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 595e0af..31d2b09 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -61,7 +61,7 @@
% conjugation with \pdfTeX{} or \LuaTeX{} in DVI mode.
% \item \texttt{dvisvgm}: The \texttt{dvisvgm} program, which works in
% conjugation with \pdfTeX{} or \LuaTeX{} when run in DVI mode as well
-% as with (u)p\TeX{} and \XeTeX{}.
+% as with (u)\pTeX{} and \XeTeX{}.
% \item \texttt{xdvipdfmx}: The driver used by \XeTeX{}.
% \end{itemize}
%
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 003188c..950a7b8 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -492,7 +492,7 @@
% by the \cs{iow_wrap:nnnN}
% function. This value depends on the \TeX{} system in use: the standard
% value is $78$, which is typically correct for unmodified \TeX{}live
-% and MiK\TeX{} systems.
+% and \hologo{MiKTeX} systems.
% \end{variable}
%
% \subsection{Constant input--output streams, and variables}
@@ -704,7 +704,7 @@
% underlying mechanism needs to be queried. For \LaTeXe{} and plain \TeX{}
% this data is stored in |\count16|: with the \pkg{etex} package loaded
% we need to subtract $1$ as the register holds the number of the next
-% stream to use. In Con\TeX{}t, we need to look at |\count38| but there
+% stream to use. In \ConTeXt{}, we need to look at |\count38| but there
% is no subtraction: like the original plain \TeX{}/\LaTeXe{} mechanism
% it holds the value of the \emph{last} stream allocated.
% \begin{macrocode}
@@ -1299,7 +1299,7 @@
% This is the \enquote{raw} number of characters in a line which
% can be written to the terminal.
% The standard value is the line length typically used by
-% \TeX{}Live and Mik\TeX{}.
+% \TeX{}Live and \hologo{MiKTeX}.
% \begin{macrocode}
\int_new:N \l_iow_line_count_int
\int_set:Nn \l_iow_line_count_int { 78 }
diff --git a/l3kernel/l3final.dtx b/l3kernel/l3final.dtx
index fd795a9..19ae76c 100644
--- a/l3kernel/l3final.dtx
+++ b/l3kernel/l3final.dtx
@@ -67,7 +67,7 @@
%<@@=char>
% \end{macrocode}
%
-% The letters |a|--|z| and |A|--|Z| have the correct catcode directly from Ini\TeX{}
+% The letters |a|--|z| and |A|--|Z| have the correct catcode directly from \IniTeX{}
% while for Unicode engines (almost) all characters to be treated as letters
% are defined by the automatic data parsing. Thus the changes here are to
% deal with the additional cases.
diff --git a/l3kernel/l3fp-expo.dtx b/l3kernel/l3fp-expo.dtx
index c4810a0..524972a 100644
--- a/l3kernel/l3fp-expo.dtx
+++ b/l3kernel/l3fp-expo.dtx
@@ -280,7 +280,7 @@
% \frac {\left\lfloor 10^8 \cdot A\right\rfloor} {y} - \frac{1}{2}
% \right\rfloor.
% \]
-% (The $1/2$ comes from how e\TeX{} rounds.) As for division, it is
+% (The $1/2$ comes from how \eTeX{} rounds.) As for division, it is
% easy to see that $Q_{1} \leq 10^4 A / Z$, \emph{i.e.}, $Q_{1}$
% is an underestimate.
%
diff --git a/l3kernel/l3names.dtx b/l3kernel/l3names.dtx
index 0c5e1de..b78df43 100644
--- a/l3kernel/l3names.dtx
+++ b/l3kernel/l3names.dtx
@@ -71,8 +71,8 @@
% \item[{\cs[no-index]{xetex_\ldots}}] Introduced by \XeTeX{};
% \item[{\cs[no-index]{luatex_\ldots}}] Introduced by \LuaTeX{};
% \item[{\cs[no-index]{utex_\ldots}}] Introduced by \XeTeX{} and \LuaTeX{};
-% \item[{\cs[no-index]{ptex_\ldots}}] Introduced by p\TeX{};
-% \item[{\cs[no-index]{uptex_\ldots}}] Introduced by up\TeX{}.
+% \item[{\cs[no-index]{ptex_\ldots}}] Introduced by \pTeX{};
+% \item[{\cs[no-index]{uptex_\ldots}}] Introduced by \upTeX{}.
% \end{itemize}
%
% \end{documentation}
@@ -1069,7 +1069,7 @@
\@@_primitive:NN \Uunderdelimiter \utex_underdelimiter:D
\@@_primitive:NN \Uvextensible \utex_vextensible:D
% \end{macrocode}
-% Primitives from p\TeX{}.
+% Primitives from \pTeX{}.
% \begin{macrocode}
\@@_primitive:NN \autospacing \ptex_autospacing:D
\@@_primitive:NN \autoxspacing \ptex_autoxspacing:D
@@ -1107,7 +1107,7 @@
\@@_primitive:NN \ybaselineshift \ptex_ybaselineshift:D
\@@_primitive:NN \yoko \ptex_yoko:D
% \end{macrocode}
-% Primitives from up\TeX{}.
+% Primitives from \upTeX{}.
% \begin{macrocode}
\@@_primitive:NN \disablecjktoken \uptex_disablecjktoken:D
\@@_primitive:NN \enablecjktoken \uptex_enablecjktoken:D
@@ -1306,10 +1306,10 @@
%</initex|package>
% \end{macrocode}
%
-% For Con\TeX{}t, two tests are needed. Both Mark~II and Mark~IV move several
+% For \ConTeXt{}, two tests are needed. Both Mark~II and Mark~IV move several
% primitives: these are all covered by the first test, again using \cs{end}
% as a marker. For Mark~IV, a few more primitives are moved: they are
-% implemented using some Lua code in the current Con\TeX{}t.
+% implemented using some Lua code in the current \ConTeXt{}.
% \begin{macrocode}
%<*package>
\etex_ifdefined:D \normalend
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 59a578d..93c7bc3 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -744,7 +744,7 @@
% \item Conditional subpatterns with look ahead/behind: \enquote{if
% what follows is [\ldots{}], then [\ldots{}]}.
% \item |(*..)| and |(?..)| sequences to set some options.
-% \item UTF-8 mode for pdf\TeX{}.
+% \item UTF-8 mode for \pdfTeX{}.
% \item Newline conventions are not done.
% In particular, we should have an option for |.| not to match newlines.
% Also, |\A| should differ from |^|, and |\Z|, |\z| and |$| should
@@ -798,7 +798,7 @@
% \item Comments: \TeX{} already has its own system for comments.
% \item |\Q...\E| escaping: this would require to read the argument
% verbatim, which is not in the scope of this module.
-% \item |\C| single byte in UTF-8 mode: Xe\TeX{} and Lua\TeX{} serve
+% \item |\C| single byte in UTF-8 mode: \XeTeX{} and \LuaTeX{} serve
% us characters directly, and splitting those into bytes is tricky,
% encoding dependent, and most likely not useful anyways.
% \end{itemize}
diff --git a/l3kernel/l3sort.dtx b/l3kernel/l3sort.dtx
index b92ab30..809d213 100644
--- a/l3kernel/l3sort.dtx
+++ b/l3kernel/l3sort.dtx
@@ -81,7 +81,7 @@
%
% \begin{texnote}
% The current implementation is limited to sorting approximately
-% $20000$ items ($40000$ in Lua\TeX{}), depending on what other
+% $20000$ items ($40000$ in \LuaTeX{}), depending on what other
% packages are loaded.
%
% Internally, the code from \pkg{l3sort} stores items in \tn{toks}
@@ -258,7 +258,7 @@
% for \tn{loctoks} every time a sorting function is called, as
% \pkg{etex} or \pkg{elocalloc} could be loaded.
%
-% In Con\TeX{}t MkIV the range is from
+% In \ConTeXt{} MkIV the range is from
% $|\c_syst_last_allocated_toks|+1$ to \cs{c_max_register_int}, and in
% MkII it is from $|\lastallocatedtoks|+1$ to \cs{c_max_register_int}.
% In all these cases, call \cs{@@_shrink_range:}. The \LaTeX3 format
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index d5e8053..849b57d 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -2770,7 +2770,7 @@
% \begin{macro}{\@@_grab_G_long_trailing:w}
% \begin{macro}{\@@_grab_G_aux:nNn}
% Optional groups are checked by meaning, so that the same code will
-% work with, for example, Con\TeX{}t-like input.
+% work with, for example, \ConTeXt{}-like input.
% \begin{macrocode}
\cs_new_protected:Npn \@@_grab_G:w #1 \@@_run_code:
{
diff --git a/l3trial/l3auxdata/l3auxdata.dtx b/l3trial/l3auxdata/l3auxdata.dtx
index f04865f..e08f9e9 100644
--- a/l3trial/l3auxdata/l3auxdata.dtx
+++ b/l3trial/l3auxdata/l3auxdata.dtx
@@ -993,7 +993,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
% For small-ish files, it's often more convenient to use |\CatchFileDef| or |\tl_set_from_file:Nnn|, but it's important to realise that in doing so the entire file is scanned in one go by \TeX; this exhausts its memory after a certain file size (roughly 2MB at time of writing for the present author).
%
% Therefore, we use the `expanding' version instead, which at first seems strange; why would you want to expand all input when reading from a file? Because this way, \TeX\ simply moves its input scanner (probably not the right word) to the file to read and can handle much larger file sizes.
-% The trick is simply to have our wrapper macro |\auxdata:nn| defined to expand to non-expanded version of itself with its arguments. (A nice trick courtesy of \hologo{eTeX}.)
+% The trick is simply to have our wrapper macro |\auxdata:nn| defined to expand to non-expanded version of itself with its arguments. (A nice trick courtesy of \eTeX{}.)
%
% This method still has limitations, but it helps.
% \begin{macrocode}
diff --git a/l3trial/l3htoks/l3htoks.dtx b/l3trial/l3htoks/l3htoks.dtx
index 57dda83..2c0b7f2 100644
--- a/l3trial/l3htoks/l3htoks.dtx
+++ b/l3trial/l3htoks/l3htoks.dtx
@@ -1078,9 +1078,9 @@
% \item Show commands \tn{show}, \tn{showbox}, \tn{showtokens},
% \tn{showthe}, \tn{showgroups}, \tn{showifs};
% \item Alignments \tn{halign}, \tn{cr}, \tn{noalign};
-% \item Lua\TeX{}'s \tn{initcatcodetable}, \tn{catcodetable},
+% \item \LuaTeX{}'s \tn{initcatcodetable}, \tn{catcodetable},
% \tn{savecatcodetable};
-% \item pdf\TeX{}'s \tn{pdfsave}, \tn{pdfsetmatrix},
+% \item \pdfTeX{}'s \tn{pdfsave}, \tn{pdfsetmatrix},
% \tn{pdfcolorstack}, \tn{pdfrestore};
% \item A couple odd primitives \tn{dump}, \tn{end}, \tn{aftergroup},
% \tn{endinput}.
diff --git a/l3trial/xfont/l3font.dtx b/l3trial/xfont/l3font.dtx
index f6bfcd0..57939b2 100644
--- a/l3trial/xfont/l3font.dtx
+++ b/l3trial/xfont/l3font.dtx
@@ -197,7 +197,7 @@
% \cs{font_suppress_not_found_error:}
% \cs{font_enable_not_found_error:}
% \end{syntax}
-% \emph{Not available in pdf\TeX{}.}
+% \emph{Not available in \pdfTeX{}.}
% In \LuaTeX{} or \XeTeX{}, the error when a font is selected but does not
% exist can be toggled with these two commands. The non-existence of a font
% can then be tested with the \cs{fontface_if_null_p:N} conditional.
More information about the latex3-commits
mailing list