From 6b273dbc9b0aa4147fd9d0b49fda5e8154849435 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Jan 2010 23:57:27 +0000 Subject: microtype 2.4 (11jan10) git-svn-id: svn://tug.org/texlive/trunk@16687 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/microtype/microtype.dtx | 391 ++++++++++++++------- .../source/latex/microtype/microtype.ins | 31 +- 2 files changed, 282 insertions(+), 140 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/microtype/microtype.dtx b/Master/texmf-dist/source/latex/microtype/microtype.dtx index 951e63447f5..9b9a551c4c9 100644 --- a/Master/texmf-dist/source/latex/microtype/microtype.dtx +++ b/Master/texmf-dist/source/latex/microtype/microtype.dtx @@ -2,13 +2,13 @@ % ^^A messages to WinEdt: % !Mode:: "TeX:DTX:UK" % !smartQuote:: "English" -% !DTXversion:: "2.3e" +% !DTXversion:: "2.4" % ------------------------------------------------------------------------ -% $Id: microtype.dtx,v 1.59 2009-11-09 06:01:14+01 schlicht Exp schlicht $ +% $Id: microtype.dtx,v 1.60 2010-01-10 02:00:23+01 schlicht Exp schlicht $ % ------------------------------------------------------------------------ % The `microtype' package % An interface to the micro-typographic extensions of pdfTeX -% Copyright (c) 2004--2009 R Schlicht +% Copyright (c) 2004--2010 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 @@ -19,7 +19,7 @@ % This work has the LPPL maintenance status `author-maintained'. % % This work consists of the files microtype.dtx and microtype.ins and the -% derived files microtype.sty and letterspace.sty. +% derived files microtype.sty, microtype.lua and letterspace.sty. % % Modified versions of the configuration files (*.cfg) may be distributed % provided that: (1) the original copyright statement is not removed, and @@ -36,7 +36,7 @@ % {letterspace} % {microtype.cfg} %<*package|letterspace|m-t> - [2009/11/09 v2.3e + [2010/01/10 v2.4 % Micro-typography with pdfTeX % Robust letterspacing % microtype main configuration file @@ -47,7 +47,7 @@ % {mt-blg.cfg}[2007/07/14 v1.0 microtype config. file: Bitstream Letter Gothic (RS)] % {mt-cmr.cfg}[2009/11/09 v2.0 microtype config. file: Computer Modern Roman (RS)] % {mt-pad.cfg}[2005/11/07 v1.5 microtype config. file: Adobe Garamond (RS)] -% {mt-pmn.cfg}[2004/11/07 v1.2 microtype config. file: Adobe Minion (HH)] +% {mt-pmn.cfg}[2009/11/14 v1.3 microtype config. file: Adobe Minion (HH/KK)] % {mt-ppl.cfg}[2005/11/16 v1.6 microtype config. file: Palatino (RS)] % {mt-ptm.cfg}[2006/04/20 v1.7 microtype config. file: Times (RS)] % {mt-ugm.cfg}[2006/01/26 v1.0 microtype config. file: URW Garamond (RS)] @@ -72,7 +72,7 @@ % \def\rmdefault{bch} % not scaled % \def\ttdefault{blg} \usepackage{ifpdf,ifluatex} -\usepackage[latin1]{\ifluatex lua-inputenc,\fi inputenc} +\usepackage[latin1]{\ifluatex luainputenc,\fi inputenc} \usepackage[T1]{fontenc} \usepackage{textcomp} \GetFileInfo{\jobname.dtx} @@ -458,7 +458,7 @@ \IfFileExists{hyperxmp.sty}{ \usepackage{hyperxmp} \hypersetup{% - pdfcopyright={\textcopyright\ 2004--2009 R Schlicht\012% + pdfcopyright={\textcopyright\ 2004--2010 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.\&\#xA;% @@ -593,6 +593,7 @@ \fi \hyphenation{An-dre-as Ber-nard Ha-rald Mi-cha-el Pe-ter Ste-phan Wolf-ram Har-ders Hop-pe Jac-kow-ski Ku-char-czyk Mei-er Mu-the-si-us Zed-ler + Sveinung % ? with-out} \def\fallbacktext#1{{\centering\itshape[#1]\par}} % abbreviations @@ -689,7 +690,7 @@ % other extensions (see section~\ref{sec:lettersp}). % %\bigskip\noindent -% This package is copyright \textcopyright\ 2004\kern.09em--2009 R Schlicht. +% This package is copyright \textcopyright\ 2004\kern.09em--2010 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}, @@ -1340,11 +1341,11 @@ % & |-|/\cmd\footnotesize/\\ %\cmidrule(r){1-1} % |normalfont| -% & /\cmd\encoding|*|/ -% & /\cmd\family|*|/ -% & /\cmd\series|*|/ -% & /\cmd\shape|*|/ -% & /\cmd\normalsize/ \\ +% & /\cmd\encoding|*|/ +% & /\cmd\family|*|/ +% & /\cmd\series|*|/ +% & /\cmd\shape|*|/ +% & /\cmd\normalsize/\\ %\bottomrule %\end{tabular} %\vskip4pt\footnotesize @@ -1976,7 +1977,7 @@ % & , , % & n, it \\ % Adobe Minion (|pmnx|, |pmnj|) -% & , , , +% & , , , , % & n, it, (sl)\fnref{fn:it-sl}, sc, si\\ % Palatino (|ppl|, |pplx|, |pplj|)\footnote{Aliases: \pkg{pxfonts} (|pxr|), % \pkg{qfonts}/QuasiPalatino, \TeX\ Gyre Pagella (|qpl|), @@ -2287,7 +2288,7 @@ %\end{verbatim} % %\changes{v1.9}{2005/07/10}{add hint about \texttt{verbatim} environment} -%\todo{introduce option to patch \texttt{verbatim}} +%\todo{introduce option to patch \texttt{verbatim}} ^^A for Karl %\paragraph{You might want to disable protrusion in \texttt{verbatim} environments.} % As you know by now, \microtype\ will by default activate character protrusion % for all fonts contained in the font set `|alltext|'. This also includes the @@ -2496,6 +2497,8 @@ % for contributing settings for the encoding, as well as to % \contributor Karl Karlsson for providing % settings for the Cyrillic encoding. +% I am indebted to \contributor \'Elie Roux , +% who contributed the |lua| module. % % I thank \contributor Philipp Lehman for adding to his % \pkg{csquotes} package the possibility to restore the original meanings of @@ -2540,10 +2543,9 @@ % \contributor Colin Rourke , % \contributor Maverick Woo , % \contributor Silas~S. Brown , -% \contributor Christian Stark , -% \contributor Marcin Borkowski +% \contributor Christian Stark % and -% \contributor \'Elie Roux . +% \contributor Marcin Borkowski . % % %\begin{thebibliography}{} @@ -2651,6 +2653,10 @@ %\begin{History} % %\Version{\expandafter\@gobble\fileversion}{\filedate} +% \item |lua| functions moved to a dedicated file +% \item Protrusion settings for encoded Minion +% +%\Version{2.3e}{2009/11/09} % \item Support for the Cyrillic encoding (protrusion, expansion, spacing) % %\Version{2.3d}{2009/03/27} @@ -2943,7 +2949,7 @@ %^^A \tagcode,\letterspacefont,\pdfcopyfont,\pdffontexpand,\pdfnoligatures, %^^A \pdfprotrudechars,\pdfadjust(interwordglue,spacing),\pdf(app,prep)endkern, %^^A \pdftracingfonts} ^^A pdftex -%\DoNotIndex{\directlua,\luaescapestring,\luatexluaescapestring,\luatexversion}^^A luatex +%\DoNotIndex{\directlua,\luatexversion} ^^A luatex %\DoNotIndex{\eplain,\usepkg@pkg} ^^A eplain %\DoNotIndex{\@backslashchar,\@cclv,\@cclvi,\@classoptionslist,\@currext, % \@currname,\@defaultunits,\@empty,\@expandtwoargs,\@firstofone,\@firstoftwo, @@ -3740,15 +3746,56 @@ \else \def\MT@lua{\directlua} \fi +% \end{macrocode} +%\end{macro} +% Some functions are loaded from a dedicated |lua| file. This avoids character +% escaping problems and incompatibilities between versions of \luatex. +% If available, we'll use the \pkg{luatextra} package to load the module. +% \begin{macrocode} +\MT@lua{ + if (luatextra and luatextra.use_module) then + luatextra.use_module("microtype") + else + dofile(kpse.find_file("microtype.lua")) + end} }\relax % % +% % \end{macrocode} -%\end{macro} +% 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 )} +% \begin{macrocode} +%<*luafile> +if microtype then + -- we simply don't load +else + +microtype = {} + +microtype.module = { + name = "microtype", + version = 2.4, + date = "2010/01/10", + description = "microtype module.", + author = "R Schlicht", + copyright = "R Schlicht", + license = "LPPL", +} + +if luatextra and luatextra.provides_module then + luatextra.provides_module(microtype.module) +end + +% +% \end{macrocode} +% To be continued, but first back to primitives. %\begin{macro}{\MT@glet} %\changes{v1.9f}{2006/08/09}{new macro} -% The forgotten primitive. +% Here's the forgotten one. % \begin{macrocode} +%<*package|letterspace> \def\MT@glet{\global\let} % \end{macrocode} %\end{macro} @@ -3927,18 +3974,6 @@ %<*package> % \end{macrocode} %\end{macro} -% In \texlive\ 2009 all \luatex\ primitives are prefixed with `|luatex|'. -%\changes{v2.3e}{2009/10/22}{compatibility fix for \texlive\ 2009 \luatex\ -% (reported by \contributor \'Elie Roux )} -% ^^A private mail, 2009/10/21 -% \begin{macrocode} -%<*lua> -\MT@requires@luatex{ - \MT@ifdefined@c@TF\luatexluaescapestring\relax - {\let\luatexluaescapestring\luaescapestring} -}\relax -% -% \end{macrocode} %\begin{macro}{\MT@ifint} % Test whether argument is an integer, using an old trick by Mr. Arseneau, %\changes{v1.9a}{2005/11/03}{use \cmd\pdfmatch\ if available} @@ -3950,14 +3985,7 @@ \MT@requires@pdftex6{ %<*lua> \MT@requires@luatex{ - \def\MT@ifint#1{% - \csname \MT@lua{ - if string.find("\luatexluaescapestring{#1}","^-*[0-9]+ *$") - then tex.write("@firstoftwo") - else tex.write("@secondoftwo") - end}% - \endcsname - } + \def\MT@ifint#1{\csname\MT@lua{microtype.ifint([[#1]])}\endcsname} }{ % % @@ -3979,6 +4007,18 @@ \fi } } +% +% +%<*luafile> +function microtype.ifint(s) + if string.find(s,"^-*[0-9]+ *$") then + tex.write("@firstoftwo") + else + tex.write("@secondoftwo") + end +end + +% % \end{macrocode} %\end{macro} %\begin{macro}{\MT@ifdimen} @@ -3990,20 +4030,13 @@ %\changes{v1.9b}{2006/01/05}{use \cmd\pdfmatch\ if available} % (|nd| and |nc| are new Didot resp. Cicero, added in \pdftex\ 1.30; |px| is a pixel.) %\changes{v2.2}{2007/05/10}{employ \luatex\ features if available} -%\todo{fix lua expression} +%\todo{fix \texttt{lua} expression} % \begin{macrocode} +%<*package> \MT@requires@pdftex6{ %<*lua> \MT@requires@luatex{ - \def\MT@ifdimen#1{% - \csname \MT@lua{ - if (string.find("\luatexluaescapestring{#1}","^-*[0-9]+(\@percentchar a*) *$") or - string.find("\luatexluaescapestring{#1}","^-*[0-9]*[.,][0-9]+(\@percentchar a*) *$")) - then tex.write("@firstoftwo") - else tex.write("@secondoftwo") - end}% - \endcsname - } + \def\MT@ifdimen#1{\csname\MT@lua{microtype.ifdimen([[#1]])}\endcsname} }{ % \def\MT@ifdimen#1{% @@ -4027,11 +4060,24 @@ }% } } +% +%<*luafile> +function microtype.ifdimen(s) + if (string.find(s, "^-*[0-9]+(%a*) *$") or + string.find(s, "^-*[0-9]*[.,][0-9]+(%a*) *$")) then + tex.write("@firstoftwo") + else + tex.write("@secondoftwo") + end +end + +% % \end{macrocode} %\end{macro} %\begin{macro}{\MT@ifdim} % Test floating point numbers. % \begin{macrocode} +%<*package> \def\MT@ifdim#1#2#3{% \ifdim #1\p@ #2 #3\p@ \expandafter\@firstoftwo @@ -4052,14 +4098,7 @@ \MT@requires@pdftex5{ %<*lua> \MT@requires@luatex{ - \def\MT@ifstreq#1#2{% - \csname \MT@lua{ - if "\luatexluaescapestring{#1}" == "\luatexluaescapestring{#2}" - then tex.write("@firstoftwo") - else tex.write("@secondoftwo") - end}% - \endcsname - } + \def\MT@ifstreq#1#2{\csname\MT@lua{microtype.ifstreq([[#1]],[[#2]])}\endcsname} }{ % \def\MT@ifstreq#1#2{% @@ -4081,12 +4120,28 @@ \fi } } +% +%<*luafile> +function microtype.ifstreq(s1, s2) + if s1 == s2 then + tex.write("@firstoftwo") + else + tex.write("@secondoftwo") + end +end + +% \end{macrocode} +% And here we end the |lua| file. +% \begin{macrocode} +end +% % \end{macrocode} %\end{macro} %\begin{macro}{\MT@xadd} %\changes{v1.8}{2005/04/17}{simplified} % Add item to a list. % \begin{macrocode} +%<*package> \def\MT@xadd#1#2{% \ifx#1\relax \xdef#1{#2}% @@ -4106,6 +4161,7 @@ \xdef#1{#2#1}% \fi } +% % \end{macrocode} %\end{macro} %\begin{macro}{\MT@map@clist@n} @@ -4118,7 +4174,7 @@ % Run \meta{\#2} on all elements of the comma list \meta{\#1}. This and the % following is modelled after \LaTeX3 commands. % \begin{macrocode} -% +%<*package|letterspace> \def\MT@map@clist@n#1#2{% \ifx\@empty#1\else \def\MT@clist@function##1{#2}% @@ -11786,7 +11842,8 @@ time will almost certainly lead to undesired results. Have your choice!}% % \begin{macrocode} % [ name = pad-default ] % \end{macrocode} -% \item Minion\footnote{Contributed by \contributor Harald Harders .} +% \item Minion\footnote{Contributed by \contributor Harald Harders +% and \contributor Karl Karlsson .} % (|pmnx|, |pmnj|) %\changes{v1.1}{2004/09/14}{settings for Adobe Minion (contributed by % \contributor Harald Harders )} @@ -11807,13 +11864,12 @@ time will almost certainly lead to undesired results. Have your choice!}% %\end{itemize} % \begin{macrocode} % [ name = ugm-default ] -% { } -% { encoding = OT1, +% { } +% { encoding = OT1, % { encoding = {OT1,OT4}, % family = bch } % family = blg } % family = {pad,padx,padj} } -% family = pmnj } % family = {ppl,pplx,pplj} } % family = {ptm,ptmx,ptmj} } % family = ugm } @@ -11841,7 +11897,7 @@ time will almost certainly lead to undesired results. Have your choice!}% % L = { ,80}, % L = { ,120}, % O = {50,50}, -% \OE = {50, }, +% \OE = {50, }, % \OE = {50,50}, % P = { ,100}, % P = { ,50}, @@ -12012,17 +12068,22 @@ time will almost certainly lead to undesired results. Have your choice!}% % Greek uppercase letters are in encoding only. %\changes{v1.9}{2005/07/10}{fix: remove uppercase Greek letters from encoded } % \begin{macrocode} -%<*m-t|cmr> +%<*m-t|cmr|pmn> \SetProtrusion % [ name = OT1-default, % [ name = cmr-OT1, +% [ name = pmnj-OT1, % load = default ] % load = cmr-default ] +% load = pmnj-default ] % { encoding = OT1 } % { encoding = {OT1,OT4}, +% { encoding = OT1, % family = cmr } +% family = pmnj } { - \AE = {50, }, +% \AE = {50, }, +% \OE = {50, } %<*cmr> "00 = { ,150}, % \Gamma "01 = {100,100}, % \Delta @@ -12043,7 +12104,7 @@ time will almost certainly lead to undesired results. Have your choice!}% % } -% +% % \end{macrocode} % and encodings contain some more characters. The default list % will be loaded first. @@ -12081,7 +12142,7 @@ time will almost certainly lead to undesired results. Have your choice!}% % family = ugm } { % \AE = {50, }, -% \OE = {50, }, +% \OE = {50, }, % \TH = { ,50}, % \v L = { ,250}, % \v d = { ,250}, @@ -12158,21 +12219,27 @@ time will almost certainly lead to undesired results. Have your choice!}% % % \end{macrocode} -% Settings for the encoding (generic and Computer Modern Roman).\footnote{Contributed by +% Settings for the encoding (generic, Computer Modern Roman, and Minion).\footnote{Contributed by % \contributor Karl Karlsson .} %\changes{v2.3e}{2009/10/28}{settings for encoding (contributed by % \contributor Karl Karlsson )} % ^^A private mail, 2009/10/21 +%\changes{v2.4}{2009/11/15}{settings for encoded Minion (contributed by +% \contributor Karl Karlsson )} +% ^^A private mail, 2009/11/14 % \begin{macrocode} -%<*m-t|cmr> +%<*m-t|cmr|pmn> \SetProtrusion % [ name = T2A-default, % [ name = cmr-T2A, +% [ name = pmnj-T2A, % load = default ] % load = cmr-default ] +% load = pmnj-default ] { encoding = T2A, % } % family = cmr } +% family = pmnj } { \CYRA = {50,50}, \CYRG = { ,50}, @@ -12180,23 +12247,29 @@ time will almost certainly lead to undesired results. Have your choice!}% \CYRT = {50,50}, \CYRH = {50,50}, \CYRU = {50,50}, +% \CYRS = {50, }, +% \CYRO = {50,50}, \cyrk = { ,50}, \cyrg = { ,50}, \cyrh = {50,50}, -% \cyru = {50,50}, +% \cyru = {50,50}, % \cyru = {50,70}, % _ = {100,100}, % _ = {200,200}, % \textbackslash = {100,200}, \quotedblbase = {400,400}, -% \textbackslash = {200,300}, \quotedblbase = {400,400}, +% \textbackslash = {200,300}, \quotedblbase = {400,400}, +% \textbackslash = {100,200}, \quotedblbase = {300,300}, % \textquotedbl = {300,300}, \textquotedblleft = {200,600}, % \guillemotleft = {200,200}, \guillemotright = {200,200}, % \guillemotleft = {300,200}, \guillemotright = {100,400}, - \textbraceleft = {400,200}, \textbraceright = {200,400}, - \textless = {200,100}, \textgreater = {100,200} +% \guillemotleft = {200,200}, \guillemotright = {150,300}, +% \textbraceleft = {400,200}, \textbraceright = {200,400}, +% \textbraceleft = {200, }, \textbraceright = { ,300}, +% \textless = {200,100}, \textgreater = {100,200} +% \textless = {100, }, \textgreater = { ,100} } -% +% % \end{macrocode} % Settings for the encoding (generic and Times).\footnote{Contributed by % \contributor Maciej Eder .} @@ -12276,6 +12349,9 @@ time will almost certainly lead to undesired results. Have your choice!}% } % +% \end{macrocode} +% Minion with lining numbers. +% \begin{macrocode} %<*pmn> \SetProtrusion [ name = pmnx-OT1, @@ -12295,6 +12371,15 @@ time will almost certainly lead to undesired results. Have your choice!}% 1 = {230,180} } +\SetProtrusion + [ name = pmnx-T2A, + load = pmnj-T2A ] + { encoding = {T2A}, + family = pmnx } + { + 1 = {230,180} + } + % % \end{macrocode} % Times is the default font for , therefore we provide settings for the @@ -12370,18 +12455,17 @@ time will almost certainly lead to undesired results. Have your choice!}% % [ name = ppl-it ] % [ name = ptm-it ] % [ name = ugm-it ] -% { encoding = OT1, +% { encoding = OT1, % { encoding = {OT1,OT4}, % family = bch, % family = blg, % family = {pad,padx,padj}, -% family = pmnj, % family = {ppl,pplx,pplj}, % family = {ptm,ptmx,ptmj}, % family = ugm, -% shape = {it,sl} } +% shape = {it,sl} } % shape = it } -% { } +% { } { % A = {100,50}, % A = {50, }, @@ -12389,7 +12473,6 @@ time will almost certainly lead to undesired results. Have your choice!}% % A = {50,50}, % \AE = {100, }, % \AE = {50, }, -% \AE = { ,-50}, % B = {50, }, % B = {20,-50}, % C = {50, }, @@ -12423,7 +12506,7 @@ time will almost certainly lead to undesired results. Have your choice!}% % O = {50, }, % O = {100, }, % O = {70,50}, -% \OE = {50, }, +% \OE = {50, }, % \OE = {100, }, % P = {50, }, % P = {20,-50}, @@ -12565,16 +12648,24 @@ time will almost certainly lead to undesired results. Have your choice!}% % \textquotedblleft = {600,200}, \textquotedblright = {600,200} } -%<*cmr> +%<*cmr|pmn> \SetProtrusion - [ name = cmr-it-OT1, - load = cmr-it ] - { encoding = {OT1,OT4}, - family = cmr, - shape = it } +% [ name = cmr-it-OT1, +% [ name = pmnj-it-OT1, +% load = cmr-it ] +% load = pmnj-it ] +% { encoding = {OT1,OT4}, +% { encoding = OT1, +% family = cmr, +% family = pmnj, +% shape = it } +% shape = {it,sl} } { - \AE = {100, }, - \OE = {100, }, +% \AE = {100, }, +% \AE = { ,-50}, +% \OE = {100, }, +% \OE = {50, } +%<*cmr> "00 = {200,150}, % \Gamma "01 = {150,100}, % \Delta "02 = {150, 50}, % \Theta @@ -12586,9 +12677,10 @@ time will almost certainly lead to undesired results. Have your choice!}% "08 = {150, 50}, % \Phi "09 = {150,100}, % \Psi "0A = { 50, 50} % \Omega +% } -% +% \SetProtrusion % [ name = T1-it-default, % [ name = bch-it-T1, @@ -12628,7 +12720,8 @@ time will almost certainly lead to undesired results. Have your choice!}% % . = {400,600}, % {,}= {300,500}, % \AE = {100, }, -% \OE = { 50, }, +% \AE = { ,-50}, +% \OE = { 50, }, % \OE = {100, }, % 031 = { ,-100}, % ffl % 156 = {100, }, % IJ @@ -12672,64 +12765,86 @@ time will almost certainly lead to undesired results. Have your choice!}% % \textvisiblespace = {100,100} } -%<*m-t|cmr> +%<*m-t|cmr|pmn> \SetProtrusion % [ name = T2A-it-default, % [ name = cmr-it-T2A, +% [ name = pmnj-it-T2A, % load = OT1-it ] % load = cmr-it ] +% load = pmnj-it ] { encoding = T2A, -% shape = {it,sl} } % family = cmr, +% family = pmnj, +% shape = {it,sl} } % shape = it } { -%<*cmr> - \CYRA = {100,50}, - \CYRB = {50, }, - \CYRV = {50, }, - \CYRG = {100, }, - \CYRD = {50, }, - \CYRE = {50, }, - \CYRZH = {50, }, - \CYRZ = {50, }, - \CYRI = {50, }, - \CYRISHRT = {50, }, - \CYRK = {50, }, - \CYRL = {50, }, - \CYRM = {50, }, - \CYRN = {50, }, - \CYRO = {100, }, - \CYRP = {50, }, - \CYRR = {50, }, - \CYRS = {100, }, - \CYRT = {100, }, - \CYRU = {100, }, - \CYRF = {100, }, - \CYRH = {50, }, - \CYRC = {50, }, - \CYRCH = {100, }, - \CYRSH = {50, }, - \CYRSHCH = {50, }, - \CYRHRDSN = {100, }, - \CYRERY = {50, }, - \CYRSFTSN = {50, }, - \CYREREV = {50, }, - \CYRYU = {50, }, - \CYRYA = {50, }, - _ = {100,200}, -% -% _ = { ,100}, +% \CYRA = {100,50}, +% \CYRA = {50, }, +% \CYRB = {50, }, +% \CYRV = {50, }, +% \CYRV = {20,-50}, +% \CYRG = {100, }, +% \CYRG = {10, }, +% \CYRD = {50, }, +% \CYRE = {50, }, +% \CYRE = {20,-50}, +% \CYRZH = {50, }, +% \CYRZ = {50, }, +% \CYRZ = {20,-50}, +% \CYRI = {50, }, +% \CYRI = { ,-30}, +% \CYRISHRT = {50, }, +% \CYRK = {50, }, +% \CYRK = {20, }, +% \CYRL = {50, }, +% \CYRM = {50, }, +% \CYRM = { ,-30}, +% \CYRN = {50, }, +% \CYRO = {100, }, +% \CYRO = {50, }, +% \CYRP = {50, }, +% \CYRR = {50, }, +% \CYRR = {20,-50}, +% \CYRS = {100, }, +% \CYRS = {50, }, +% \CYRT = {100, }, +% \CYRT = {70, }, +% \CYRU = {100, }, +% \CYRU = {50, }, +% \CYRF = {100, }, +% \CYRH = {50, }, +% \CYRC = {50, }, +% \CYRCH = {100, }, +% \CYRSH = {50, }, +% \CYRSHCH = {50, }, +% \CYRHRDSN = {100, }, +% \CYRERY = {50, }, +% \CYRSFTSN = {50, }, +% \CYREREV = {50, }, +% \CYRYU = {50, }, +% \CYRYA = {50, }, +% \CYRYA = { ,20}, +% \cyrr = {-50, }, +% _ = { ,100}, +% _ = {100,200}, +% 031 = { ,-100}, % ffl +% \v t = { ,100}, % \textbackslash = {100,200}, \quotedblbase = {400,500}, % \textbackslash = {300,300}, \quotedblbase = {200,600}, +% \textbackslash = {100,150}, \quotedblbase = {150,500}, % \guillemotleft = {300,300}, \guillemotright = {300,300}, % \guillemotleft = {400,100}, \guillemotright = {200,300}, +% \guillemotleft = {200,300}, \guillemotright = {150,400}, % \textbraceleft = {200,100}, \textbraceright = {200,200}, % \textbraceleft = {400,100}, \textbraceright = {200,200}, +% \textbraceleft = {200, }, \textbraceright = { ,200}, % \textquotedblleft = {500,300}, % \textless = {300,100}, \textgreater = {200,100} +% \textless = {100, }, \textgreater = { ,100} } -% +% %<*m-t|ptm> \SetProtrusion % [ name = QX-it-default, @@ -12907,6 +13022,16 @@ time will almost certainly lead to undesired results. Have your choice!}% 1 = {100,150} } +\SetProtrusion + [ name = pmnx-it-T2A, + load = pmnj-it-T2A ] + { encoding = {T2A}, + family = pmnx, + shape = {it,sl} } + { + 1 = {100,150} + } + % %<*ptm> \SetProtrusion @@ -15003,7 +15128,7 @@ normal, and shrunk by 5\%: % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % -% \CheckSum{9553} +% \CheckSum{9578} % % \Finale % diff --git a/Master/texmf-dist/source/latex/microtype/microtype.ins b/Master/texmf-dist/source/latex/microtype/microtype.ins index 6af5d5c8b79..b35d8733494 100644 --- a/Master/texmf-dist/source/latex/microtype/microtype.ins +++ b/Master/texmf-dist/source/latex/microtype/microtype.ins @@ -1,16 +1,17 @@ % !Mode:: "TeX:STY:UK" -% $Id: microtype.ins,v 1.19 2009-11-09 05:57:07+01 schlicht Exp schlicht $ +% $Id: microtype.ins,v 1.20 2010-01-10 02:00:43+01 schlicht Exp schlicht $ % ------------------------------------------------------------------------ \input docstrip \keepsilent \askonceonly +\let\MetaPrefix\relax \preamble ------------------------------------------------------------------------ The `microtype' package An interface to the micro-typographic extensions of pdfTeX - Copyright (c) 2004--2009 R Schlicht + Copyright (c) 2004--2010 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 @@ -20,8 +21,8 @@ of all distributions of LaTeX version 2005/12/01 or later. This work has the LPPL maintenance status `author-maintained'. -This work consists of the files microtype.dtx and microtype.ins and the -derived files microtype.sty and letterspace.sty. +This work consists of the files microtype.dtx and microtype.ins and the +derived files microtype.sty, microtype.lua and letterspace.sty. % Modified versions of the configuration files (*.cfg) may be distributed % provided that: (1) the original copyright statement is not removed, and @@ -44,6 +45,10 @@ derived files microtype.sty and letterspace.sty. commands. Do not use this package together with the `microtype' package. Please refer to section 7 of the `microtype' documentation. \endpreamble +\declarepreamble\luapreamble + This file contains auxiliary lua functions. + It was contributed by Elie Roux . +\endpreamble \declarepreamble\cfgpreamble This is the main configuration file for the `microtype' package. It contains settings for font expansion and character protrusion, @@ -77,15 +82,20 @@ derived files microtype.sty and letterspace.sty. \endpreamble \let\firstpreamblepart\contribpreamble \let\lastpreamblepart \defaultlastpreamblepart -\declarepreamble\haraldpreamble - Harald Harders .^^M +\declarepreamble\haraldandkarlpreamble^^M + Harald Harders and + Karl Karlsson .^^M \endpreamble +\declarepostamble\luapostamble +\endpostamble \def\makefile#1#2{\file{#1}{\from{microtype.dtx}{#2}}} \def\makecfg#1#2{\makefile{mt-#2.cfg}{config,cfg-#1,#2}} % ------------------------------------------------------------------------ +\usedir{tex/latex/microtype} +\let\MetaPrefix\DoubleperCent \generate{ \makefile{microtype.sty}{package,lua} \usepreamble\lsppreamble @@ -108,12 +118,19 @@ derived files microtype.sty and letterspace.sty. \makecfg{e}{zpeu} \makecfg{e}{euroitc} \makecfg{e}{mvs} - \usepreamble\haraldpreamble + \usepreamble\haraldandkarlpreamble \makecfg{t}{pmn} \usepreamble\testpreamble \makefile{test-microtype.tex}{test} } +\def\MetaPrefix{--} +\generate{ + \usepreamble \luapreamble + \usepostamble\luapostamble + \makefile{microtype.lua}{luafile} +} + \obeyspaces \Msg{***********************************************************************} \Msg{* To finish installation, move all files to their appropriate places. *} -- cgit v1.2.3