summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-14 22:10:53 +0000
committerKarl Berry <karl@freefriends.org>2016-05-14 22:10:53 +0000
commit7018dd6ace780dbf792b16f2c70294d5363db14c (patch)
treec8405ebc1026aeef3fffef06264880d6625110a0 /Master/texmf-dist/tex/latex
parente28c751e2974cde2d2ccdd4f9c2710a31b918838 (diff)
microtype (14may16)
git-svn-id: svn://tug.org/texlive/trunk@41127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/microtype/letterspace.sty32
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype-luatex.def22
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def5
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype-xetex.def2
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.lua8
-rw-r--r--Master/texmf-dist/tex/latex/microtype/microtype.sty2
7 files changed, 32 insertions, 41 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
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
index d37b39b7763..957efc99d22 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-luatex.def
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-luatex.def}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
Definitions specific to
luatex
(RS)]
@@ -397,9 +397,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@
}%
@@ -458,16 +459,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
}
\def\MT@get@tr@opt{%
@@ -735,7 +730,8 @@
\KV@@sp@def\@tempa{##1}\MT@get@slot
\ifnum\MT@char>\m@ne
\tagcode#1\MT@char=\m@ne
- \MT@if@fontspec@font{\MT@lua{microtype.noligatures([[#1]],[[\MT@char]])}}\relax
+ \MT@if@fontspec@font
+ {\MT@lua{microtype.noligatures([[#1]],[[\MT@char]])}}\relax
\fi
}%
\MT@vinfo{... Disabling ligatures for characters: #2}%
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
index fbf8c63fb54..91f36c2301f 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-pdftex.def
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-pdftex.def}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
Definitions specific to
pdftex
(RS)]
@@ -1351,6 +1351,9 @@
}
\MT@define@optionX@{tracking}{\ifnum\@tempcnta=\z@ \let\MT@tracking\MT@set@tr@zero
\else \let\MT@tracking\MT@tracking@ \fi}
+ \MT@define@optionX@{spacing}{\pdfadjustinterwordglue\@tempcnta}
+ \MT@define@optionX@{kerning}{\pdfprependkern\@tempcnta
+ \pdfappendkern\@tempcnta}
}{
\define@key{MTX}{tracking}[true]{\MT@warning{Ignoring tracking setup}}
\define@key{MTX}{kerning}[true]{\MT@warning{Ignoring kerning setup}}
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
index 0e570ebb469..141310f3578 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
+++ b/Master/texmf-dist/tex/latex/microtype/microtype-xetex.def
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-xetex.def}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
Definitions specific to
xetex
(RS)]
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
index 19788fe60ef..1c7b1f80502 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg
@@ -40,7 +40,7 @@
%%
\ProvidesFile
{microtype.cfg}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
microtype main configuration file
(RS)]
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua
index b6ac668d4f8..58a8d28d6c8 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.lua
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua
@@ -35,8 +35,8 @@ microtype = microtype or {}
local microtype = microtype
microtype.module = {
name = "microtype",
- version = 2.6,
- date = "2016/05/01",
+ version = "2.6a",
+ date = "2016/05/14",
description = "microtype module.",
author = "E. Roux, R. Schlicht and P. Gesang",
copyright = "E. Roux, R. Schlicht and P. Gesang",
@@ -51,7 +51,7 @@ local match = string.match
local tex_write = tex.write
function microtype.sprint (...)
- tex.sprint(luatexbase.catcodetables['latex-package'], ...)
+ tex.sprint(luatexbase.catcodetables['latex-package'], ...)
end
local function if_int(s)
@@ -92,7 +92,7 @@ local function do_font()
end
if thefont then
for i,v in next,thefont.characters do
- if v.index > 0 then
+ if v.index == nil or v.index > 0 then
microtype.sprint([[\@tempcnta=]]..i..[[\relax\MT@dofont@function]])
end
end
diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty
index 75d2aa3ea44..e5fc5d29fa7 100644
--- a/Master/texmf-dist/tex/latex/microtype/microtype.sty
+++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{microtype}
- [2016/05/01 v2.6
+ [2016/05/14 v2.6a
Micro-typographical refinements
(RS)]
\def\MT@MT