summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/microtype
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-06-23 20:55:16 +0000
committerKarl Berry <karl@freefriends.org>2022-06-23 20:55:16 +0000
commit9c66efeecfcda608dc42a60f2e0543bcf337b6b3 (patch)
tree374c207360ed272e1a6feb1ede0afe5684a6f6a0 /Master/texmf-dist/source/latex/microtype
parentd5dbb419bfc9c813884f68f26f223b2be0dd307e (diff)
microtype (23jun22)
git-svn-id: svn://tug.org/texlive/trunk@63703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/microtype')
-rw-r--r--Master/texmf-dist/source/latex/microtype/microtype-utf.dtx5
-rw-r--r--Master/texmf-dist/source/latex/microtype/microtype.dtx108
2 files changed, 52 insertions, 61 deletions
diff --git a/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx b/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
index 2d6110dd2ea..fc6226a095a 100644
--- a/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
+++ b/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx
@@ -27,7 +27,7 @@
\ProvidesFile
%</!EBGaramond>
%<*driver>
- {\jobname.dtx}[2022/06/20 v3.0e]
+ {\jobname.dtx}[2022/06/23 v3.0f]
%</driver>
%<CharisSIL> {mt-CharisSIL.cfg}[2017/07/07 v1.1 microtype config. file: Charis SIL (RS)]
%<LatinModernRoman> {mt-LatinModernRoman.cfg}[2021/02/21 v1.1 microtype config. file: Latin Modern Roman (RS)]
@@ -37,8 +37,7 @@
%<TU-empty> {mt-TU-empty.cfg}[2021/06/22 v1.1 microtype config. file: fonts with nonstandard glyph set (RS)]
%<*driver>
\makeatletter
-\AddToHook{package/doc/before}{\pkgcls@targetdate=1 \def\pkgcls@targetlabel{v2}}
-\documentclass[10pt,a4paper]{ltxdoc}
+\documentclass[10pt,a4paper,doc2]{ltxdoc}
\usepackage{fontspec}
\usepackage{luatexbase}
\RequireLuaModule{luainputenc}
diff --git a/Master/texmf-dist/source/latex/microtype/microtype.dtx b/Master/texmf-dist/source/latex/microtype/microtype.dtx
index eb724cae42d..1df1413136a 100644
--- a/Master/texmf-dist/source/latex/microtype/microtype.dtx
+++ b/Master/texmf-dist/source/latex/microtype/microtype.dtx
@@ -37,7 +37,7 @@
%<lua-> {microtype-luatex.def}
%<xe-> {microtype-xetex.def}
%<*package|letterspace|m-t|pdf-|lua-|xe-|show>
- [2022/06/20 v3.0e
+ [2022/06/23 v3.0f
%<package> Micro-typographical refinements
%<letterspace> Robust letterspacing
%<show> Visual debugging for the microtype package
@@ -52,8 +52,8 @@
%<luafile>local microtype = microtype
%<luafile>microtype.module = {
%<luafile> name = "microtype",
-%<luafile> version = "3.0e",
-%<luafile> date = "2022/06/20",
+%<luafile> version = "3.0f",
+%<luafile> date = "2022/06/23",
%<luafile> description = "microtype module.",
%<luafile> author = "E. Roux, R. Schlicht and P. Gesang",
%<luafile> copyright = "E. Roux, R. Schlicht and P. Gesang",
@@ -3337,9 +3337,10 @@
% `\contributor NightShade <@\at @>', ^^A https://tex.stackexchange.com/users/260836/nightshade
% \contributor Nelson Lago <@\at @>, ^^A https://github.com/urrameu
% \contributor Brian Dunn <@\at @>, ^^A https://github.com/bdtc
-% \contributor Ralf Steinle <rasteinle\at web.de>
+% \contributor Ralf Steinle <rasteinle\at web.de>,
+% \contributor Denis Bitouz\'e <@\at @> ^^A https://tex.stackexchange.com/users/18401/denis-bitouz%c3%a9
% and
-% \contributor Denis Bitouz\'e <@\at @>. ^^A https://tex.stackexchange.com/users/18401/denis-bitouz%c3%a9
+% \contributor Christophe Dervieux <@\at @>. ^^A https://github.com/cderv
%
%\iffalse
%\section{History of micro-typography} ^^A some time ...
@@ -3486,6 +3487,8 @@
%
%\VersionDate{\expandafter\@gobble\fileversion}{\filedate}
%
+%\VersionDate{3.0e}{2022/06/20}
+%
%\VersionDate{3.0d}{2022/03/14}
%
%\VersionDate{3.0c}{2022/02/22}
@@ -3864,11 +3867,11 @@
%^^A\DoNotIndex{\adjustspacing,\copyfont,\expandglyphsinfont,
%^^A \ignoreligaturesinfont,\outputmode,\protrudechars,\tracingfonts} ^^A luatex
%\DoNotIndex{\eplain,\usepkg@pkg} ^^A eplain
-%\DoNotIndex{\@backslashchar,\@car,\@cclvi,\@classoptionslist,\@currext,
-% \@currname,\@defaultunits,\@elt,\@empty,\@@enc@update,\@eqnnum,\@expandtwoargs,
-% \@firstofone,\@firstoftwo,\@fontenc@load@list,\@footnotetext,\@gobble,\@gobbletwo,
-% \@ifclassloaded,\@ifl@t@r,\@ifl@aded,\@ifpackagelater,\@ifpackageloaded,\@ifstar,
-% \@ifundefined,\@item,\@let@token,\@m,\@M,\@makeother,\@minus,\@mpfootnotetext,
+%\DoNotIndex{\@backslashchar,\@car,\@cclvi,\@changed@cmd,\@classoptionslist,
+% \@current@cmd,\@currext,\@currname,\@defaultunits,\@empty,\@@enc@update,
+% \@eqnnum,\@expandtwoargs,\@firstofone,\@firstoftwo,\@footnotetext,\@gobble,
+% \@gobbletwo,\@ifclassloaded,\@ifl@t@r,\@ifl@aded,\@ifpackagelater,\@ifpackageloaded,
+% \@ifstar,\@ifundefined,\@item,\@let@token,\@m,\@M,\@makeother,\@minus,\@mpfootnotetext,
% \@nameuse,\@ne,\@newlistfalse,\@nil,\@nnil,\@onelevel@sanitize,\@onlypreamble,
% \@pkgextension,\@plus,\@ptionlist,\@removeelement,\@secondoftwo,\@spaces,\@sptoken,
% \@tempa,\@tempb,\@tempc,\@tempcnta,\@tempcntb,\@tempdima,\@typeset@protect,
@@ -3877,16 +3880,17 @@
% \maybe@ic@,\nfss@text,\not@math@alphabet,\on@line,\p@,\set@display@protect,
% \strip@prefix,\strip@pt,\@text@composite,\tw@,\z@,\z@skip,\zap@space,
% \active,\bfseries,\documentclass,\dotfill,\fbox,\fboxrule,\fboxsep,\fmtversion,
-% \footnotesize,\huge,\Huge,\itshape,\large,\Large,\LARGE,\leavevmode,\llap,
-% \makeatletter,\makebox,\mathrm,\mbox,\mdseries,\medskip,\newbox,\newcommand,
-% \newcount,\newdimen,\newif,\newline,\newskip,\newtoks,\nobreak,\nonfrenchspacing,
-% \normalbaselineskip,\normalsize,\numberline,\obeylines,\par,\parbox,\providecommand,
-% \quad,\raggedright,\renewcommand,\rmfamily,\scalebox,\sffamily,\scriptsize,\scshape,
-% \slshape,\small,\space,\strut,\textwidth,\texttt,\tiny,\tracingnone,\ttfamily,
-% \upshape,\usefont,\tiny,\AddToHook,\AtBeginDocument,\AtEndOfPackage,\CheckCommand,
-% \CurrentOption,\DeclareOption,\DeclareRobustCommand,\IfFileExists,\IfFormatAtLeastTF,
-% \InputIfFileExists,\MessageBreak,\PackageError,\PackageInfo,\PackageWarning,
-% \PassOptionsToPackage,\ProcessOptions,\RawNoindent,\RequirePackage,\UnicodeEncodingName}
+% \fontseriesforce,\fontshapeforce,\footnotesize,\huge,\Huge,\itshape,\large,\Large,
+% \LARGE,\leavevmode,\llap,\makeatletter,\makebox,\mathrm,\mbox,\mdseries,\medskip,
+% \newbox,\newcommand,\newcount,\newdimen,\newif,\newline,\newskip,\newtoks,\nobreak,
+% \nonfrenchspacing,\normalbaselineskip,\normalshape,\normalsize,\numberline,\obeylines,
+% \par,\parbox,\providecommand,\quad,\raggedright,\renewcommand,\rmfamily,\scalebox,
+% \sffamily,\scriptsize,\scshape,\slshape,\small,\space,\sscshape,\strut,\swshape,
+% \textwidth,\texttt,\tiny,\tracingnone,\ttfamily,\upshape,\ulcshape,\usefont,\tiny,
+% \AddToHook,\AtBeginDocument,\AtEndOfPackage,\CheckCommand,\CurrentOption,\DeclareOption,
+% \DeclareRobustCommand,\IfFileExists,\IfFormatAtLeastTF,\InputIfFileExists,\MessageBreak,
+% \PackageError,\PackageInfo,\PackageWarning,\PassOptionsToPackage,\ProcessOptions,
+% \RawNoindent,\RequirePackage,\UnicodeEncodingName}
%^^A\DoNotIndex{\add@accent,\cf@encoding,\curr@fontshape,\define@newfont,
%^^A \do@subst@correction,\f@encoding,\f@family,\f@size,\font@name,\fontencoding,
%^^A \fontseries,\fontshape,\glb@currsize,\glb@settings,\normalfont,\pickup@font,
@@ -8310,15 +8314,19 @@ time will almost certainly lead to undesired results. Have your choice!}%
% \end{macrocode}
%\end{macro}
%\begin{macro}{\MT@prot@iflicrcmd}
+%\changes{v3.0f}{2022/06/22}{no need to know about encodings
+% (also fixes \githubissue{20}, reported by
+% \contributor Christophe Dervieux <@\at @>)}
% Fun with <LICR>:
-% Test if the first command of the third command of the first command
-% is \cmd\@text@composite, in which case also grab the next token,
+% If we have an encoding command, test if the first command of the third command
+% (\eg, |\T1\"|) is \cmd\@text@composite, in which case also grab the next token,
% otherwise it should be a text command.
% \begin{macrocode}
\def\MT@getthird#1#2#3#4\@nil{#3}
-\def\MT@prot@iflicrcmd#1{%
- \MT@exp@cs\MT@prot@iffirstcmd{#1-cmd}{%
- \expandafter\expandafter\expandafter\let
+\def\MT@prot@iflicrcmd{%
+ \MT@prot@iffirstcmd\@current@cmd\@secondoftwo\@firstofone
+ {\MT@prot@iffirstcmd\@changed@cmd\@firstofone\@gobble}%
+ {\expandafter\expandafter\expandafter\let
\expandafter\expandafter\expandafter\@tempa
\expandafter\MT@getthird\MT@prot@next\relax\@nil
\MT@exp@two@c\ifx\@car\@tempa\relax\@nil\@text@composite
@@ -8326,34 +8334,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\else
\def\MT@temp*##1{\MT@prot@l{\the\MT@toks##1}}%
\fi
- \MT@tlist@break
- }\relax
-}
-%</package>
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\MT@enc@list}
-%\changes{v3.0e}{2022/06/09}{new macro: no more guesswork about encodings}
-% The list of all loaded font encodings. For \LaTeX\ formats older than
-% 2020/02/11 (before \cmd\@fontenc@load@list\ was introduced), we don't
-% bother doing any guesswork (like \pkg{babel} used to do). Also, we
-% don't consider the older <EU1>/<EU2> encodings.
-% \begin{macrocode}
-%<pdf-|lua-|xe->\def\MT@enc@list
-%<pdf-> {{T1}{OT1}}
-%<lua-|xe-> {{TU}}
-%<*package>
-\MT@addto@setup{%
- \ifx\@fontenc@load@list\@undefined \else
- \def\@elt#1{,#1,}%
- \edef\@tempa{\@fontenc@load@list}%
- \MT@map@clist@c\@tempa{%
- \MT@ifempty{#1}\relax{%
- \MT@in@tlist{#1}\MT@enc@list
- \ifMT@inlist@\else\edef\MT@enc@list{\MT@enc@list{#1}}\fi
- }%
- }%
- \fi
+ }%
}
% \end{macrocode}
%\end{macro}
@@ -8440,6 +8421,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
%\changes{v3.0e}{2022/06/09}{new macro: make list of commands extensible}
%\changes{v3.0e}{2022/05/13}{ignore \cmd\@empty}
%\changes{v3.0e}{2022/06/15}{add standard font selection commands}
+%\changes{v3.0f}{2022/06/22}{add \microtype's commands}
% Here's the list of commands to be added to our toks.
% We'll postpone the handling of commands whose argument would have
% to be processed (\eg, \cmd\textrm).
@@ -8449,14 +8431,23 @@ time will almost certainly lead to undesired results. Have your choice!}%
{S\rmfamily}{S\sffamily}{S\ttfamily}{S\mdseries}{S\bfseries}%
{S\upshape}{S\slshape}{S\itshape}{S\scshape}%
{S\normalfont}{S\selectfont}%
+ {S\lsstyle}%
{S\tiny}{S\scriptsize}{S\footnotesize}{S\small}{S\normalsize}%
{S\large}{S\Large}{S\LARGE}{S\huge}{S\Huge}%
{O\fontencoding}{O\fontfamily}{O\fontseries}{O\fontshape}%
+ {O\microtypesetup}{O\microtypecontext}%
{T\fontsize}%
}
% \end{macrocode}
-%\end{macro}
-% If \pkg{yfonts} is loaded, we add the relevant commands (again, those that
+% \LaTeX\ 2020/02/02 introduced some more commands.
+%\changes{v3.0f}{2022/06/22}{add new NFSS commands}
+% \begin{macrocode}
+\IfFormatAtLeastTF{2020/02/02}
+ {\g@addto@macro\MT@prot@check@cmds{%
+ {S\swshape}{S\ulcshape}{S\sscshape}{S\normalshape}%
+ {O\fontseriesforce}{O\fontshapeforce}}}{}
+% \end{macrocode}
+% If \pkg{yfonts} is loaded, we add the relevant commands (again, only those that
% don't take an argument).
% \begin{macrocode}
\MT@addto@setup{%
@@ -8464,6 +8455,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
{\g@addto@macro\MT@prot@check@cmds{{S\frakfamily}{S\swabfamily}{S\gothfamily}}}%
}
% \end{macrocode}
+%\end{macro}
%\begin{macro}{\MT@prot@get@first@group}
% If next char is |{|, start a group and try again, else continue until
% we find a beginning char.
@@ -8503,7 +8495,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
\let\MT@prot@ifmacro\MT@prot@ifmacro@
\MT@map@tlist@c\MT@prot@check@cmds\MT@prot@check
% \end{macrocode}
-% \dots~or a command/active char whose first command is one of the following.
+% \dots~or a command/active char whose first command is one of the following:
% \begin{macrocode}
\MT@prot@ifmacro{%
\MT@prot@iffirstcmd\UTFviii@two@octets{%
@@ -8522,7 +8514,7 @@ time will almost certainly lead to undesired results. Have your choice!}%
% \end{macrocode}
% or, finally, a <LICR> command.
% \begin{macrocode}
- \MT@map@tlist@c\MT@enc@list\MT@prot@iflicrcmd
+ \MT@prot@iflicrcmd
}%
}%
}%
@@ -19992,7 +19984,7 @@ This is the current font stretched by 5\%, normal, and shrunk by 5\%:
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \CheckSum{12609}
+% \CheckSum{12598}
%
% \Finale
%