From 5f7d0d6c9c581dd584154903b848da6ab55f359d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Mar 2022 19:58:42 +0000 Subject: microtype (15mar22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62718 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/microtype/microtype-utf.dtx | 2 +- .../source/latex/microtype/microtype.dtx | 78 +++++++++++++--------- 2 files changed, 46 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx b/Master/texmf-dist/source/latex/microtype/microtype-utf.dtx index 67d8566f19e..469e99b6d94 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 % %<*driver> - {\jobname.dtx}[2022/02/22 v3.0c] + {\jobname.dtx}[2022/03/14 v3.0d] % % {mt-CharisSIL.cfg}[2017/07/07 v1.1 microtype config. file: Charis SIL (RS)] % {mt-LatinModernRoman.cfg}[2021/02/21 v1.1 microtype config. file: Latin Modern Roman (RS)] diff --git a/Master/texmf-dist/source/latex/microtype/microtype.dtx b/Master/texmf-dist/source/latex/microtype/microtype.dtx index 1649f7fed48..4e061d18103 100644 --- a/Master/texmf-dist/source/latex/microtype/microtype.dtx +++ b/Master/texmf-dist/source/latex/microtype/microtype.dtx @@ -37,7 +37,7 @@ % {microtype-luatex.def} % {microtype-xetex.def} %<*package|letterspace|m-t|pdf-|lua-|xe-|show> - [2022/02/22 v3.0c + [2022/03/14 v3.0d % Micro-typographical refinements % Robust letterspacing % Visual debugging for the microtype package @@ -52,8 +52,8 @@ %local microtype = microtype %microtype.module = { % name = "microtype", -% version = "3.0c", -% date = "2022/02/22", +% version = "3.0d", +% date = "2022/03/14", % description = "microtype module.", % author = "E. Roux, R. Schlicht and P. Gesang", % copyright = "E. Roux, R. Schlicht and P. Gesang", @@ -1382,7 +1382,6 @@ % See section~\ref{sub:expansion} for a more detailed discussion. % % -%\pagebreak ^^A layout %\subsection[Tracking] % {Tracking \requires{\pdftex~1.40,\luatex~0.62}} % \label{sub:options-tracking} @@ -1556,6 +1555,7 @@ % words, this is equivalent to specifying \emph{all} possible values for that % attribute. % Therefore, the predefined set `|alltext|', which is declared as: +%\enlargethispage{\baselineskip} ^^A layout %\begin{verbatim} %\DeclareMicrotypeSet{alltext} % { encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2,TU} } @@ -3121,6 +3121,7 @@ %! TeX capacity exceeded, sorry [maximum internal font number (font_max)=<2000>]. %\end{verbatim} % Memory parameter `|font_max|' too small. +%\pagebreak ^^A layout % \item %\begin{verbatim} %! TeX capacity exceeded, sorry [PDF memory size (pdf_mem_size)=<65536>]. @@ -3331,9 +3332,11 @@ % `\contributor theufman <@\at @>', ^^A https://github.com/theufman % `\contributor frafl <@\at @>', ^^A https://github.com/frafl % \contributor Joel Coffman <@\at @>, ^^A https://github.com/joel-coffman -% `\contributor user182849 <@\at @>' ^^A https://tex.stackexchange.com/users/182849/user182849 +% `\contributor user182849 <@\at @>', ^^A https://tex.stackexchange.com/users/182849/user182849 +% `\contributor NightShade <@\at @>', ^^A https://tex.stackexchange.com/users/260836/nightshade +% \contributor Nelson Lago <@\at @> ^^A https://github.com/urrameu % and -% `\contributor NightShade <@\at @>'. ^^A https://tex.stackexchange.com/users/260836/nightshade +% \contributor Brian Dunn <@\at @>. ^^A https://github.com/bdtc % %\iffalse %\section{History of micro-typography} ^^A some time ... @@ -3480,6 +3483,8 @@ % %\VersionDate{\expandafter\@gobble\fileversion}{\filedate} % +%\VersionDate{3.0c}{2022/02/22} +% %\VersionDate{3.0b}{2021/12/10} % %\VersionDate{3.0a}{2021/12/02} @@ -3856,25 +3861,25 @@ %^^A \ignoreligaturesinfont,\outputmode,\protrudechars,\tracingfonts} ^^A luatex %\DoNotIndex{\eplain,\usepkg@pkg} ^^A eplain %\DoNotIndex{\@backslashchar,\@car,\@cclvi,\@classoptionslist,\@currext, -% \@currname,\@defaultunits,\@elt,\@empty,\@eqnnum,\@expandtwoargs,\@fileswfalse, +% \@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,\@undefined,\@unprocessedoptions,\@unusedoptionlist, -% \@xobeysp,\check@icr,\cl@@ckpt,\color@begingroup,\color@endgroup,\g@addto@macro, -% \hmode@bgroup,\m@ne,\maybe@ic,\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, +% \@xobeysp,\check@icr,\color@begingroup,\color@endgroup,\g@addto@macro,\hmode@bgroup, +% \m@ne,\maybe@ic,\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,\documentclass,\dotfill,\fbox,\fboxrule,\fboxsep,\fmtversion,\footnotesize, % \leavevmode,\llap,\makeatletter,\makebox,\mathrm,\mbox,\medskip,\newbox,\newcommand, % \newcount,\newdimen,\newif,\newline,\newskip,\newtoks,\nobreak,\nonfrenchspacing, -% \normalbaselineskip,\normalsize,\numberline,\obeylines,\par,\parbox,\quad,\raggedright, -% \renewcommand,\scalebox,\space,\strut,\textwidth,\texttt,\tiny,\tracingnone,\usefont, -% \value,\AddToHook,\AtBeginDocument,\AtEndOfPackage,\CheckCommand,\CurrentOption, -% \DeclareOption,\DeclareRobustCommand,\IfFileExists,\IfFormatAtLeastTF,\InputIfFileExists, -% \MessageBreak,\PackageError,\PackageInfo,\PackageWarning,\PassOptionsToPackage, -% \ProcessOptions,\RawNoindent,\RequirePackage,\@@enc@update,\UnicodeEncodingName} +% \normalbaselineskip,\normalsize,\numberline,\obeylines,\par,\parbox,\providecommand, +% \quad,\raggedright,\renewcommand,\scalebox,\space,\strut,\textwidth,\texttt,\tiny, +% \tracingnone,\usefont,\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, @@ -3886,7 +3891,8 @@ %\DoNotIndex{\CJK@ifundefined,\CJK@plane,\CJK@temp,\CJK@addcmap} ^^A CJK,CJKutf8 %\DoNotIndex{\color} ^^A color %\DoNotIndex{\csqQQ,\csq@bqgroup,\csq@eqgroup,\@disablequotes} ^^A csquotes -%\DoNotIndex{\ifHy@hyperfootnotes,\pdfstringdefDisableCommands,\pdfstringdefWarn} ^^A hyperref +%\DoNotIndex{\ifHy@hyperfootnotes,\hyper@@anchor,\Hy@footnote@currentHref, +% \pdfstringdefDisableCommands,\pdfstringdefWarn} ^^A hyperref %\DoNotIndex{\ifpdf,\ifetex,\ifluatex,\ifxetex} ^^A ifpdf/iftex %\DoNotIndex{\@inpenc@undefined@,\IeC,\inputencoding,\inputencodingname} ^^A inputenc %^^A\DoNotIndex{\UTFviii@defined,\UTF@four@octets@noexpand, ^^A inputenc/utf8 @@ -3903,7 +3909,7 @@ %\DoNotIndex{\tikz@expandcount} ^^A tikz %\DoNotIndex{\conditionally@traceoff} ^^A trace %\DoNotIndex{\@xspace,\@xspace@firsttrue} ^^A xspace -%\DoNotIndex{\apptocmd,\patchcmd} ^^A etoolbox +%\DoNotIndex{\apptocmd,\gappto,\patchcmd} ^^A etoolbox %\DoNotIndex{\beamer@@callorigitem,\beamer@callorigitem} ^^A beamer %\DoNotIndex{\eqref,\tagform@} ^^A amsmath %\DoNotIndex{\@topic@item} ^^A simplecv @@ -5559,8 +5565,10 @@ microtype.if_dimen = if_dimen %<*pdf-|xe-> %\MT@requires@pdftex5{ \def\MT@ifstreq#1#2{% -% \ifnum\pdfstrcmp{#1}{#2}=\z@ -% \ifnum\strcmp{#1}{#2}=\z@ + \ifnum +% \pdfstrcmp +% \strcmp + {#1}{#2}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -8110,10 +8118,10 @@ time will almost certainly lead to undesired results. Have your choice!}% % Typeset the text inside a box and get the left and right margin kerns. % We add an extra \cmd\vbox\ in case we're inside a |tabular|. % \cmd\@newlistfalse\ is meant to make \cmd\\ work in |centering| etc. -%\changes{v3.0a}{2021/11/22}{reset counters}^^A %\changes{v3.0a}{2021/11/05}{compatibility fix for \pkg{csquotes} % (reported by \contributor Gustavo Barros <@\at @>) \githubissue{1}}^^A % ^^A https://tex.stackexchange.com/questions/621440/microtype-csquotes-autoquote-and-itemize-interaction +%\changes{v3.0a}{2021/11/22}{reset counters}^^A %\changes{v3.0a}{2021/11/27}{set penalties to zero and vfuzz to max % (reported by \contributor florian <@\at @>)}^^A % ^^A https://tex.stackexchange.com/questions/624171/overfull-vbox-in-list-of-figures-since-miktex-update @@ -8121,8 +8129,9 @@ time will almost certainly lead to undesired results. Have your choice!}% % We set various penalties to zero to allow linebreaking, and don't % bother if the split box is overfull (but shouldn't we? -- after all, % that's how the penalties bug was discovered~\dots). -%\begin{macro}{\MT@ckpt} -% We also reset the counters and disable writing to auxiliary files. +%\changes{v3.0d}{2022/03/03}{no longer reset counters +% (reported by \contributor Brian Dunn <@\at @>) \githubissue{14}} +% (We no longer reset counters etc., since we don't typeset groups anymore.) %\begin{macro}{\MT@prot@hook} % Furthermore, we have a hook for compatibility fixes (not used at the moment), %\begin{macro}{\MT@csq@eqgroup} @@ -8149,10 +8158,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \fi \def\MT@get@prot#1#2{% \begingroup - \def\@elt##1{\global\value{##1}\the\value{##1}\relax}% - \edef\MT@ckpt{\cl@@ckpt}% - \let\@elt\relax - \@fileswfalse \setbox\MT@tempbox\vbox{% \everypar{}% \parfillskip=\z@skip @@ -8173,7 +8178,6 @@ time will almost certainly lead to undesired results. Have your choice!}% \global\setbox\MT@tempbox=\lastbox \fi }% - \MT@ckpt \endgroup \leavevmode \ifhbox\MT@tempbox @@ -8190,7 +8194,6 @@ time will almost certainly lead to undesired results. Have your choice!}% %\end{macro} %\end{macro} %\end{macro} -%\end{macro} %\begin{macro}{\MT@prot@ifx} % Test next token. % \begin{macrocode} @@ -8291,8 +8294,10 @@ time will almost certainly lead to undesired results. Have your choice!}% %\changes{v3.0b}{2021/12/05}{don't rescan anymore % (reported by \contributor Akira Yokosawa <@\at @> % and \contributor theufman <@\at @>) \githubissue{3,4}} +%\changes{v3.0d}{2022/02/26}{no brace delimiting +% (reported by \contributor Nelson Lago <@\at @>) \githubissue{10}} % \begin{macrocode} -\def\MT@prot@group#{\bgroup\afterassignment\MT@prot@get@firstchar\let\MT@temp= } +\def\MT@prot@group{\bgroup\afterassignment\MT@prot@get@firstchar\let\MT@temp= } % \end{macrocode} %\end{macro} %\begin{macro}{\MT@prot@get@firstchar} @@ -9322,11 +9327,18 @@ microtype.add_ls = add_ls %\changes{v2.3}{2007/11/03}{redone: extract outer kerns from current letterspacing % amount} % For Fraktur fonts, some ligatures shouldn't be broken up. This command will -% temporarily select the base font and insert the correct kerning. +% temporarily select the base font (making sure to really select the current font) +%\changes{v3.0d}{2022/03/01}{define \cmd\font@name\ +% (reported by \contributor Ulrike Fischer ) +% \githubissue{12}} +% and insert the correct kerning. % \begin{macrocode} \DeclareRobustCommand\lslig[1]{% {\MT@ifdefined@c@TF\MT@curr@ls{% \escapechar\m@ne +% \MT@requires@latex2{% + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% +% }\relax% \MT@get@ls@basefont \MT@outer@kern=\dimexpr\MT@curr@ls sp * \fontdimen6\font@name/2000\relax \kern\MT@outer@kern @@ -9353,7 +9365,7 @@ microtype.add_ls = add_ls \MT@exp@two@c\MT@glet\MT@ls@basefont\font@name \else %\MT@dinfo@nl{1}{... fixing base font}% - \MT@exp@two@c\let\font@name\MT@ls@basefont + \MT@set@lsbasefont \fi } % \end{macrocode} @@ -19761,7 +19773,7 @@ This is the current font stretched by 5\%, normal, and shrunk by 5\%: % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % -% \CheckSum{12399} +% \CheckSum{12387} % % \Finale % -- cgit v1.2.3