From 2e4672ed6f7b49c9d1c44b6ca850cfe7024fc639 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 12 Oct 2019 03:00:57 +0000 Subject: CTAN sync 201910120300 --- macros/latex/contrib/microtype/README.md | 4 +- macros/latex/contrib/microtype/microtype-utf.dtx | 16 +-- macros/latex/contrib/microtype/microtype.dtx | 132 ++++++++++++++++------- macros/latex/contrib/microtype/microtype.ins | 2 +- macros/latex/contrib/microtype/microtype.pdf | Bin 1674734 -> 1689839 bytes 5 files changed, 105 insertions(+), 49 deletions(-) (limited to 'macros/latex/contrib/microtype') diff --git a/macros/latex/contrib/microtype/README.md b/macros/latex/contrib/microtype/README.md index 8a41cadef5..211ed32576 100644 --- a/macros/latex/contrib/microtype/README.md +++ b/macros/latex/contrib/microtype/README.md @@ -4,7 +4,7 @@ The `microtype` package **Subliminal refinements towards typographical perfection** - (v2.7b -- 2019/02/28) + (v2.7c -- 2019/10/10) Overview @@ -76,5 +76,5 @@ provided that: (1) the original copyright statement is not removed, and (2) the identification string is changed. ------------------------------------------------------ -Copyright (c) 2004--2018 R Schlicht `` +Copyright (c) 2004--2019 R Schlicht `` ------------------------------------------------------ diff --git a/macros/latex/contrib/microtype/microtype-utf.dtx b/macros/latex/contrib/microtype/microtype-utf.dtx index bcac8618c8..c72fca3f54 100644 --- a/macros/latex/contrib/microtype/microtype-utf.dtx +++ b/macros/latex/contrib/microtype/microtype-utf.dtx @@ -1,11 +1,11 @@ %\iffalse meta-comment % !Mode:: "TeX:DTX:UK" % !smartQuote:: "English" -% !DTXversion:: "2.7b" +% !DTXversion:: "2.7c" % ------------------------------------------------------------------------ % The `microtype' package % Subliminal refinements towards typographical perfection -% Copyright (c) 2004--2018 R Schlicht +% Copyright (c) 2004--2019 R Schlicht % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3c of this license or (at @@ -26,7 +26,7 @@ % \ProvidesFile %<*driver> - {\jobname.dtx}[2019/02/28 v2.7b] + {\jobname.dtx}[2019/10/10 v2.7c] % % {mt-CharisSIL.cfg}[2017/07/07 v1.1 microtype config. file: Charis SIL (RS)] % {mt-LatinModernRoman.cfg}[2013/03/13 v1.0 microtype config. file: Latin Modern Roman (RS)] @@ -49,12 +49,10 @@ \luatexbase@directlua{luatexbase.add_to_callback('process_input_buffer', luainputenc.fake_utf_read, 'luainputenc.fake_utf_read')} \usepackage{microtype-doc} \luatexbase@directlua{luatexbase.remove_from_callback('process_input_buffer', 'luainputenc.fake_utf_read')} -\let\lsstyle\relax % !!!!!!! ATTENTION, PLEASE !!!!!!!!! (letterspacing is broken in luatex 1.07) \def\setmacrofont#1{\par\def\macro@font{#1}\footnotesize} \newfontface\LMR{Latin Modern Roman} \newfontface\CharisSIL{Charis SIL} \newfontface\PalatinoLinotype{TeX Gyre Pagella} -\textheight=626pt % this isn't set correctly for some reason \usepackage{luacode} \tracinglostchars2 % we replace any missing characters (in Palatino) with CharisSIL @@ -72,6 +70,7 @@ color_push.stack, color_pop.stack = 0,0 color_push.command,color_pop.command = 1,2 color_push.data = "0.97 0.04 0.07 rg" -- red local fallbackfont = font.id("fallbackfont") +local fallbackchar = 0xFFFD -- Unicode replacement character table.setmetatableindex(fontcharacters, function (t, k) if k == true then return fontcharacters[currentfont()] @@ -100,10 +99,11 @@ local nodeprocessor = function (head) lastfont = currfont if not characters[char] then head = node.insert_before(head,n,node.copy(color_push)) + node.remove(head,node.next(n)) -- remove .notdef char (new in luaotfload 2.98) node.insert_after(head,n,node.copy(color_pop)) n.font = fallbackfont if not fontcharacters[fallbackfont][char] then -- not even in Charis SIL - n.char = 0xFFFD + n.char = fallbackchar end end end @@ -370,7 +370,7 @@ luatexbase.add_to_callback("pre_linebreak_filter", nodeprocessor, "replace missi % Unfortunately, I don't have a Palatino variant containing all of the following % glyphs. The settings are typeset in \TeX\ Gyre Pagella; % missing glyphs, printed in red, are taken from Charis ; -% glyphs missing even in Charis appear as `\char"FFFD'. +% glyphs missing even in Charis appear as `\char"FFFD@'. % To see the real settings, consult \file{mt-PalatinoLinotype.cfg}. %{\setmacrofont\PalatinoLinotype % \begin{macrocode} @@ -1291,7 +1291,7 @@ luatexbase.add_to_callback("pre_linebreak_filter", nodeprocessor, "replace missi fl = { 0,50}, ffl = { 0,50}, ſt = { 0,50}, - st = { 0,50} + st = { 0,50} % \end{macrocode} %} % \begin{macrocode} diff --git a/macros/latex/contrib/microtype/microtype.dtx b/macros/latex/contrib/microtype/microtype.dtx index cc267648a3..3871ffedc3 100644 --- a/macros/latex/contrib/microtype/microtype.dtx +++ b/macros/latex/contrib/microtype/microtype.dtx @@ -1,11 +1,11 @@ %\iffalse meta-comment % !Mode:: "TeX:DTX:UK" % !smartQuote:: "English" -% !DTXversion:: "2.7b" +% !DTXversion:: "2.7c" % ------------------------------------------------------------------------ % The `microtype' package % Subliminal refinements towards typographical perfection -% Copyright (c) 2004--2018 R Schlicht +% Copyright (c) 2004--2019 R Schlicht % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3c of this license or (at @@ -37,7 +37,7 @@ % {microtype-luatex.def} % {microtype-xetex.def} %<*package|letterspace|m-t|pdftex-def|luatex-def|xetex-def> - [2019/02/28 v2.7b + [2019/10/10 v2.7c % Micro-typographical refinements % Robust letterspacing % microtype main configuration file @@ -51,8 +51,8 @@ %local microtype = microtype %microtype.module = { % name = "microtype", -% version = "2.7b", -% date = "2019/02/28", +% version = "2.7c", +% date = "2019/10/10", % description = "microtype module.", % author = "E. Roux, R. Schlicht and P. Gesang", % copyright = "E. Roux, R. Schlicht and P. Gesang", @@ -141,6 +141,15 @@ \ifluatex % microtype.dtx finally compiles with 0.35! \microtypesetup{kerning=false} \def\pdftexversion{200} % in TeX Live 2015, they let this to \luatexversion + \let\pdfxform \saveboxresource + \let\pdflastxform \lastsavedboxresourceindex + \protected\edef\pdfminorversion {\pdfvariable minorversion} + \protected\def\pdfobj {\pdfextension obj } + \protected\def\pdfannot {\pdfextension annot } + \protected\def\pdfoutline {\pdfextension outline } + \protected\def\pdfmapline {\pdfextension mapline } + \protected\def\pdfglyphtounicode {\pdfextension glyphtounicode } + \protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax} \fi \ifnum\pdftexversion<140 \else % pdftex 1.40, including textmatrix patch, \microtypesetup{expansion=alltext,step=1} % hence we can activate expansion ... @@ -558,7 +567,7 @@ pdfkeywords={TeX, LaTeX, pdfTeX, LuaTeX, XeTeX, typography, micro-typography, character protrusion, margin kerning, optical alignment, font expansion, font scaling, hz, kerning, spacing, glue, letterspacing, tracking, ligatures}, - pdfcopyright={\textcopyright\ 2004--2018 R Schlicht\012% + pdfcopyright={\textcopyright\ 2004--2019 R Schlicht\012% This work 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.\012% @@ -801,7 +810,7 @@ % other extensions (see section~\ref{sec:lettersp}). % %\bigskip\noindent -% This package is copyright \textcopyright\ 2004\kern.09em--2018 R Schlicht. +% This package is copyright \textcopyright\ 2004\kern.09em--2019 R Schlicht. % It may be distributed and/or modified under the conditions of the % \IfFileExists{lppl.tex}{\hyperref[LPPL:LPPL]}{\href{http://www.latex-project.org/lppl/}} % {\LaTeX\ Project Public License}, @@ -2854,9 +2863,12 @@ % \contributor Nils Anders Danielsson , % \contributor Paolo Ney <@\at @>, ^^A https://tex.stackexchange.com/users/29161/paulo-ney % \contributor Frank Mittelbach , -% \contributor Franz Wexler <@\at @> ^^A https://tex.stackexchange.com/users/182307/franz-wexler +% \contributor Franz Wexler <@\at @>, ^^A https://tex.stackexchange.com/users/182307/franz-wexler +% \contributor Moritz Wemheuer , +% `\contributor Andy N <@\at @>', ^^A https://tex.stackexchange.com/users/182462/andy-n +% \contributor Phelype Oleinik % and -% \contributor Moritz Wemheuer . +% \contributor Falk Hanisch . % % %\iffalse @@ -2942,19 +2954,19 @@ % % \bibitem[\LaTeXe\ font selection]{fntguide} % \LaTeX3 Project Team, \emph{\LaTeXe\ font selection}, -% \newblock 27 November 2005. -% \newblock (\ctanurl{macros/latex/doc/fntguide.pdf}) +% \newblock July 2019. +% \newblock (\ctanurl{macros/latex/base/fntguide.pdf}) % % \bibitem[\pkg{fontspec}]{fontspec} % Will Robertson, % \emph{The \pkg{fontspec} package: Font selection for \xe\LaTeX\ and Lua\LaTeX}, -% \newblock 12~February 2019. +% \newblock 15~March 2019. % \newblock (\ctanpkgurl{fontspec}) % % \bibitem[\pkg{luaotfload}]{luaotfload} % \'Elie Roux, Khaled Hosny, Philipp Gesang, Ulrike Fischer, % \emph{The \pkg{luaotfload} package}, -% \newblock 14~February 2019. +% \newblock 13~September 2019. % \newblock (\ctanpkgurl{luaotfload}) % % \bibitem[\pkg{pdfcprot}]{pdfcprot} @@ -3007,6 +3019,8 @@ % %\VersionDate{\expandafter\@gobble\fileversion}{\filedate} % +%\VersionDate{2.7b}{2019/02/28} +% %\VersionDate{2.7a}{2018/01/14} % %\Version{2.7}{2017/07/07} @@ -3349,10 +3363,10 @@ % \@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,\tw@,\z@,\z@skip, -% \zap@space,\active,\documentclass,\leavevmode,\makeatletter,\mbox,\newcommand, -% \newcount,\newdimen,\newif,\newskip,\newtoks,\nobreak,\nonfrenchspacing, -% \normalsize,\renewcommand,\space,\AtBeginDocument,\AtEndOfPackage, -% \CheckCommand,\CurrentOption,\DeclareRobustCommand,\IfFileExists, +% \zap@space,\active,\documentclass,\fmtversion,\leavevmode,\makeatletter, +% \mbox,\newcommand,\newcount,\newdimen,\newif,\newskip,\newtoks,\nobreak, +% \nonfrenchspacing,\normalsize,\renewcommand,\space,\AtBeginDocument, +% \AtEndOfPackage,\CheckCommand,\CurrentOption,\DeclareRobustCommand,\IfFileExists, % \InputIfFileExists,\MessageBreak,\PackageError,\PackageInfo,\PackageWarning, % \RequirePackage,\@@enc@update,\cf@encoding,\f@encoding} %^^A\DoNotIndex{\add@accent,\curr@fontshape,\define@newfont,\do@subst@correction, @@ -4233,7 +4247,7 @@ % Here it begins. The module was contributed by \'Elie Roux. %\changes{v2.4}{2009/11/12}{new file \file{microtype.lua} containing the \texttt{lua} functions % (contributed by \contributor \'Elie Roux )} -%\changes{v2.7b}{2019/02/28}{update lua function \texttt{microtype.warning} after changes in \pkg{luaotfload} +%\changes{v2.7b}{2019/02/28}{update lua function \texttt{microtype.info} after changes in \pkg{luaotfload} % (reported by \contributor Moritz Wemheuer and % \contributor Ulrike Fischer )} % ^^A private mail, 2019/02/19 @@ -4241,8 +4255,8 @@ % \begin{macrocode} %<*luafile> -function microtype.warning(...) - luatexbase.module_warning("microtype",...) +function microtype.info(...) + luatexbase.module_info("microtype",...) end local find = string.find @@ -8026,6 +8040,9 @@ time will almost certainly lead to undesired results. Have your choice!}% % to check whether they should be kept or inhibited. % Here's our concoction of this function. The table |microtype.ligs| will % be populated in \cmd\MT@noligatures@. +%\changes{v2.7c}{2019/03/08}{turn warning into info when overwriting the \texttt{keepligature} function +% (reported by \contributor Andy N <@\at @>)} +% ^^A https://tex.stackexchange.com/questions/478344/ % \begin{macrocode} %<*luafile> microtype.ligs = microtype.ligs or { } @@ -8064,7 +8081,7 @@ end if luaotfload and luaotfload.letterspace then if luaotfload.letterspace.keepligature then - microtype.warning("overwriting function `keepligature'") + microtype.info("overwriting function `keepligature'") end luaotfload.letterspace.keepligature = keepligature end @@ -8852,6 +8869,13 @@ end \let\IeC\@firstofone \let\@inpenc@undefined@\MT@undefined@char % \end{macrocode} +% Unicode handling has changed again with \LaTeX\ 2019/10/01. +%\changes{v2.7c}{2019/10/10}{compatibility with \LaTeX\ 2019/10/01} ^^A https://github.com/latex3/latex2e/commit/2edd9339ed9a710d45b435ba91545240d0cc9528#diff-d138747c4604d436824f8cb7cedd7d46 +% \begin{macrocode} + \let\UTF@two@octets@noexpand\@empty + \let\UTF@three@octets@noexpand\@empty + \let\UTF@four@octets@noexpand\@empty +% \end{macrocode} % We refrain from checking whether there is a sufficient number of octets. % \begin{macrocode} \def\UTFviii@defined##1{\ifx ##1\relax @@ -8902,12 +8926,21 @@ end \meaning\expandafter\MT@char\MT@charstring\relax\relax\relax \ifnum\MT@char@ < \z@ % \end{macrocode} +%\changes{v2.7c}{2019/08/13}{take care of \cs{remove@tlig}} +% For encoding, the commands \cmd\textquotesingle, \cmd\textasciigrave\ +% and \cmd\textquotedbl\ are defined by means of the auxiliary macro +% \cmd\remove@tlig, which we take care of here. +% \begin{macrocode} + \expandafter\expandafter\expandafter\MT@is@tlig\MT@char\relax\relax + \ifnum\MT@char@ < \z@ +% \end{macrocode} %\changes{v2.2}{2007/03/07}{expand once more (for \pkg{frenchpro})} -% \dots~or, if it hasn't been defined by \cs{DeclareTextSymbol}, a letter +% Finally, if it hasn't been defined by \cs{DeclareTextSymbol}, it could be a letter % (\eg, \cmd\i, when using \pkg{frenchpro}). ^^A as noted by Bernard Gaulle % ^^A private mail, 2005/01/28 % \begin{macrocode} - \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax + \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax + \fi \fi } % \end{macrocode} @@ -8984,6 +9017,16 @@ end %\end{macro} %\end{macro} %\end{macro} +%\begin{macro}{\MT@is@tlig} +% This might have to change again with the next \LaTeX\ release. ^^A see https://github.com/latex3/latex2e/issues/165 +% \begin{macrocode} +\def\MT@is@tlig#1#2{% + \ifx#1\remove@tlig + \MT@is@number #2\relax\relax + \fi +} +% \end{macrocode} +%\end{macro} %\begin{macro}{\MT@is@composite} % Here, we are dealing with accented characters, specified as two tokens. %\changes{v1.7}{2005/03/10}{new macro: construct command for composite character; @@ -9033,7 +9076,7 @@ end } % \end{macrocode} %\end{macro} -%\begin{macro}{MT@is@uni@comp} +%\begin{macro}{\MT@is@uni@comp} % Helper for \cs{DeclareUnicodeComposite}. % \begin{macrocode} \def\MT@is@uni@comp#1\iffontchar#2\else#3\fi\relax{% @@ -12317,24 +12360,37 @@ end \MT@check@active@set{ex}% % \end{macrocode} %\end{macro} +%\begin{macro}{\showhyphens} %\changes{v1.7}{2005/03/02}{modify \cmd\showhyphens} % Inside \cmd\showhyphens, font expansion should be disabled. % (Since 2017/01/10, the \LaTeX\ format contains a different version % for \xetex, but since expansion doesn't work with \xetex, we don't % have to bother.) -% \begin{macrocode} - \CheckCommand*\showhyphens[1]{\setbox0\vbox{% - \color@begingroup\everypar{}\parfillskip\z@skip - \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne - \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}% -% \end{macrocode} -%\begin{macro}{\showhyphens} -% I wonder why it's defined globally (in \file{ltfssbas.dtx})? -% \begin{macrocode} - \gdef\showhyphens##1{\setbox0\vbox{% - \color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip - \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne - \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}% +%\changes{v2.7c}{2019/10/02}{compatibility with \LaTeX\ 2019/10/01 +% (reported by \contributor Phelype Oleinik +% and \contributor Falk Hanisch )} +% ^^A private mail, 2019/09/26 +% ^^A private mail, 2019/10/08 +% Since 2019/10/01, the command is robust. +% \begin{macrocode} + \MT@ifdefined@n@TF{showhyphens }{% + \def\MT@temp##1##2{% + \expandafter\CheckCommand\csname showhyphens \endcsname[1]{##1}% + \DeclareRobustCommand\showhyphens[1]{##2}}% + }{% + \def\MT@temp##1##2{% + \CheckCommand*\showhyphens[1]{##1}% + \gdef\showhyphens####1{##2}}% + }% + \MT@temp + {\setbox0\vbox{\color@begingroup + \everypar{}\parfillskip\z@skip + \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne + \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}} + {\setbox0\vbox{\color@begingroup\pdfadjustspacing\z@ + \everypar{}\parfillskip\z@skip + \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne + \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}% % \end{macrocode} %\end{macro} % \begin{macrocode} @@ -17015,7 +17071,7 @@ normal, and shrunk by 5\%: % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % -% \CheckSum{10590} +% \CheckSum{10630} % % \Finale % diff --git a/macros/latex/contrib/microtype/microtype.ins b/macros/latex/contrib/microtype/microtype.ins index a3e78ea1e5..7fa515b865 100644 --- a/macros/latex/contrib/microtype/microtype.ins +++ b/macros/latex/contrib/microtype/microtype.ins @@ -10,7 +10,7 @@ The `microtype' package Subliminal refinements towards typographical perfection - Copyright (c) 2004--2018 R Schlicht + Copyright (c) 2004--2019 R Schlicht This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at diff --git a/macros/latex/contrib/microtype/microtype.pdf b/macros/latex/contrib/microtype/microtype.pdf index 0cd1804f64..95bd060f8a 100644 Binary files a/macros/latex/contrib/microtype/microtype.pdf and b/macros/latex/contrib/microtype/microtype.pdf differ -- cgit v1.2.3