summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/microtype/letterspace.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/microtype/letterspace.sty')
-rw-r--r--Master/texmf-dist/tex/latex/microtype/letterspace.sty32
1 files changed, 12 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
index f25a97bc47b..8de486ee244 100644
--- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty
+++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty
@@ -33,7 +33,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{letterspace}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
Robust letterspacing
(RS)]
\def\MT@MT
@@ -155,6 +155,7 @@
\def\MT@glet{\global\let}
\def\MT@exp@cs#1#2{\expandafter#1\csname#2\endcsname}
\def\MT@edef@n{\MT@exp@cs\edef}
+\def\MT@let@cn#1#2{\expandafter\let\expandafter#1\csname #2\endcsname}
\def\MT@exp@one@n#1#2{\expandafter#1\expandafter{#2}}
\def\MT@exp@two@c#1{\expandafter\expandafter\expandafter#1\expandafter}
\def\MT@ifdefined@c@TF#1{%
@@ -221,12 +222,7 @@
\advance\@tempcnta \@ne
\ifnum\@tempcnta < #2\MT@repeat
}
-\def\MT@do@font#1{%
- \MT@if@fontspec@font{%
- \def\MT@dofont@function{#1}%
- \MT@lua{microtype.do_font()}%
- }{\MT@while@num\z@\@cclvi{#1}}%
-}
+\def\MT@do@font{\MT@while@num\z@\@cclvi}
\MT@requires@latex1{
\let\MT@setup@\@empty
\def\MT@addto@setup{\g@addto@macro\MT@setup@}
@@ -245,6 +241,9 @@
\ifMT@fontspec\MT@fontspec@setup\fi
\MT@addto@setup{%
\MT@requires@latex2{
+ \MT@with@package@T{fontspec}{\MT@fontspectrue\MT@fontspec@setup}%
+ }\relax
+ \MT@requires@latex2{
\MT@with@package@T{hyperref}{%
\pdfstringdefDisableCommands{%
\def\lsstyle{\pdfstringdefWarn\lsstyle}%
@@ -275,9 +274,10 @@
\expandafter\ifx\MT@lsfont\relax
\MT@get@ls@basefont
\MT@if@fontspec@font{%
+ \ifnum\MT@letterspace@<\z@\def\MT@minus{-}\else\let\MT@minus\@empty\fi
\global\expandafter\font\MT@lsfont=%
\expandafter\MT@exp@two@c\expandafter\MT@ls@fontspec@font
- \expandafter\fontname\expandafter\MT@font\space \@nil
+ \expandafter\fontname\expandafter\font@name\space \@nil
}{%
\global\expandafter\letterspacefont\MT@lsfont\font@name\MT@letterspace@
}%
@@ -318,16 +318,10 @@
\def\MT@ls@fontspec@colon#1:#2:#3\@nil{#1:#2}
\def\MT@ls@fontspec@font#1 #2\@nil{%
"\MT@ls@fontspec@colon#1::\@nil
- kernfactor=%
- \ifnum\MT@letterspace@<\z@ -0.%
- \ifnum-\MT@letterspace@<100 0\fi
- \ifnum-\MT@letterspace@<10 0\fi
- \number-\MT@letterspace@
- \else 0.%
- \ifnum\MT@letterspace@<100 0\fi
- \ifnum\MT@letterspace@<10 0\fi
- \number\MT@letterspace@
- \fi;"
+ kernfactor=\MT@minus \ifnum\MT@letterspace@=1000 1\else 0.%
+ \ifnum\MT@minus\MT@letterspace@<100 0\fi
+ \ifnum\MT@minus\MT@letterspace@<10 0\fi
+ \number\MT@minus\MT@letterspace@ \fi;"
\ifx\\#2\\ at \f@size pt\else#2\fi\relax
}
\MT@requires@latex2{
@@ -428,8 +422,6 @@
}
\MT@requires@latex2{
\MT@addto@setup{%
- \MT@with@package@T{luatexja}{\MT@warn@unknown@once{luatexja}}%
- \MT@with@package@T{xeCJK} {\MT@warn@unknown@once{xeCJK}}%
\@ifpackageloaded{CJK}{%
\@ifpackageloaded{xeCJK}{\@firstofone}{%
\@ifpackagelater{CJK}{2006/10/17}% 4.7.0