diff options
author | Karl Berry <karl@freefriends.org> | 2010-01-12 23:57:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-01-12 23:57:27 +0000 |
commit | 6b273dbc9b0aa4147fd9d0b49fda5e8154849435 (patch) | |
tree | defa73a9a6a4f5105b70b96fb2665d9119b4ef23 /Master/texmf-dist/tex | |
parent | 7637db066f528aa60f1d837e4ef03105a19ec24d (diff) |
microtype 2.4 (11jan10)
git-svn-id: svn://tug.org/texlive/trunk@16687 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
20 files changed, 254 insertions, 102 deletions
diff --git a/Master/texmf-dist/tex/latex/microtype/letterspace.sty b/Master/texmf-dist/tex/latex/microtype/letterspace.sty index 7d0a1af6b45..0f49716a828 100644 --- a/Master/texmf-dist/tex/latex/microtype/letterspace.sty +++ b/Master/texmf-dist/tex/latex/microtype/letterspace.sty @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a stand-alone version that only provides the letterspacing @@ -32,7 +32,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {letterspace} - [2009/11/09 v2.3e + [2010/01/10 v2.4 Robust letterspacing (RS)] \def\MT@MT diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.cfg b/Master/texmf-dist/tex/latex/microtype/microtype.cfg index 83115070e7f..c0b735f6294 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.cfg +++ b/Master/texmf-dist/tex/latex/microtype/microtype.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is the main configuration file for the `microtype' package. @@ -39,7 +39,7 @@ %% \ProvidesFile {microtype.cfg} - [2009/11/09 v2.3e + [2010/01/10 v2.4 microtype main configuration file (RS)] @@ -588,7 +588,7 @@ { encoding = T2A, shape = {it,sl} } { - _ = { ,100}, + _ = { ,100}, \textbackslash = {100,200}, \quotedblbase = {400,500}, \guillemotleft = {300,300}, \guillemotright = {300,300}, \textbraceleft = {200,100}, \textbraceright = {200,200}, diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.lua b/Master/texmf-dist/tex/latex/microtype/microtype.lua new file mode 100644 index 00000000000..7590e2095b4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/microtype/microtype.lua @@ -0,0 +1,79 @@ +-- +-- This is file `microtype.lua', +-- generated with the docstrip utility. +-- +-- The original source files were: +-- +-- microtype.dtx (with options: `luafile') +-- +-- ------------------------------------------------------------------------ +-- +-- The `microtype' package +-- An interface to the micro-typographic extensions of pdfTeX +-- Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> +-- +-- 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. The latest version of this license is in: +-- http://www.latex-project.org/lppl.txt, and version 1.3c or later is part +-- 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, microtype.lua and letterspace.sty. +-- +-- ------------------------------------------------------------------------ +-- This file contains auxiliary lua functions. +-- It was contributed by Elie Roux <elie.roux{at}telecom-bretagne.eu>. +-- ------------------------------------------------------------------------ +-- +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 + +function microtype.ifint(s) + if string.find(s,"^-*[0-9]+ *$") then + tex.write("@firstoftwo") + else + tex.write("@secondoftwo") + end +end + +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 + +function microtype.ifstreq(s1, s2) + if s1 == s2 then + tex.write("@firstoftwo") + else + tex.write("@secondoftwo") + end +end + +end +-- +-- +-- End of file `microtype.lua'. diff --git a/Master/texmf-dist/tex/latex/microtype/microtype.sty b/Master/texmf-dist/tex/latex/microtype/microtype.sty index b84d3a598f1..018f1f958ac 100644 --- a/Master/texmf-dist/tex/latex/microtype/microtype.sty +++ b/Master/texmf-dist/tex/latex/microtype/microtype.sty @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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,15 +20,15 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {microtype} - [2009/11/09 v2.3e + [2010/01/10 v2.4 Micro-typography with pdfTeX (RS)] \def\MT@MT @@ -235,6 +235,12 @@ \else \def\MT@lua{\directlua} \fi +\MT@lua{ + if (luatextra and luatextra.use_module) then + luatextra.use_module("microtype") + else + dofile(kpse.find_file("microtype.lua")) + end} }\relax \def\MT@glet{\global\let} \def\MT@exp@cs#1#2{\expandafter#1\csname#2\endcsname} @@ -297,20 +303,9 @@ \fi } \endgroup -\MT@requires@luatex{ - \MT@ifdefined@c@TF\luatexluaescapestring\relax - {\let\luatexluaescapestring\luaescapestring} -}\relax \MT@requires@pdftex6{ \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} }{ \def\MT@ifint#1{% \ifcase\pdfmatch{^-*[0-9]+ *$}{#1}\relax @@ -331,15 +326,7 @@ } \MT@requires@pdftex6{ \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{% \ifcase\pdfmatch{^([0-9]+([.,][0-9]+)?|[.,][0-9]+)% @@ -371,14 +358,7 @@ } \MT@requires@pdftex5{ \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{% \ifcase\pdfstrcmp{#1}{#2}\relax diff --git a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg index 6cb13373a41..795a8e1653f 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-bch.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg index efae38cd00e..d328a68752e 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-blg.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg index 5ce65196d3a..569a465f32d 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-cmr.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -153,7 +153,7 @@ \cyrh = {50,50}, \cyru = {50,70}, _ = {200,200}, - \textbackslash = {200,300}, \quotedblbase = {400,400}, + \textbackslash = {200,300}, \quotedblbase = {400,400}, \textquotedbl = {300,300}, \textquotedblleft = {200,600}, \guillemotleft = {300,200}, \guillemotright = {100,400}, \textbraceleft = {400,200}, \textbraceright = {200,400}, @@ -316,7 +316,7 @@ \CYREREV = {50, }, \CYRYU = {50, }, \CYRYA = {50, }, - _ = {100,200}, + _ = {100,200}, \textbackslash = {300,300}, \quotedblbase = {200,600}, \guillemotleft = {400,100}, \guillemotright = {200,300}, \textbraceleft = {400,100}, \textbraceright = {200,200}, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg index 0a6ccad86dc..e9bc49ea379 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euf.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg index f83e322626c..aead497cb7c 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eur.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg index dd11662dffd..c550af7a186 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-euroitc.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg index 53c06abe3fc..33f16930902 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-eus.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg index 1c969249352..f0b954eb8ea 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msa.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg index 926088d4aaf..6ed2d1fcc98 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-msb.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg index 6e5eef64041..666cd337dda 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-mvs.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg index 4b4763ee154..4ab10ff8359 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pad.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg index f39225a9ec7..618c231f7d0 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-pmn.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. @@ -37,20 +37,21 @@ %% ------------------------------------------------------------------------ %% %% These settings have been prepared by, and are copied with the -%% generous permission of: Harald Harders <h.harders{at}tu-bs.de>. +%% generous permission of: +%% Harald Harders <h.harders{at}tu-bs.de> and +%% Karl Karlsson <karl-karlsson{at}yandex.ru>. %% %% ------------------------------------------------------------------------ %% \ProvidesFile - {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)] %%% ----------------------------------------------------------------------- %%% PROTRUSION \SetProtrusion [ name = pmnj-default ] - { encoding = OT1, - family = pmnj } + { } { A = {50,50}, C = {50, }, @@ -61,7 +62,6 @@ K = { ,50}, L = { ,50}, O = {50,50}, - \OE = {50, }, Q = {50,70}, T = {50,50}, V = {50,50}, @@ -102,11 +102,21 @@ } \SetProtrusion + [ name = pmnj-OT1, + load = pmnj-default ] + { encoding = OT1, + family = pmnj } + { + \OE = {50, } + } + +\SetProtrusion [ name = pmnj-T1, load = pmnj-default ] { encoding = {T1,LY1}, family = pmnj } { + \OE = {50, }, \TH = { ,50}, _ = {100,100}, \textbackslash = {100,200}, @@ -120,6 +130,30 @@ } \SetProtrusion + [ name = pmnj-T2A, + load = pmnj-default ] + { encoding = T2A, + family = pmnj } + { + \CYRA = {50,50}, + \CYRG = { ,50}, + \CYRK = { ,50}, + \CYRT = {50,50}, + \CYRH = {50,50}, + \CYRU = {50,50}, + \CYRS = {50, }, + \CYRO = {50,50}, + \cyrk = { ,50}, + \cyrg = { ,50}, + \cyrh = {50,50}, + \cyru = {50,50}, + \textbackslash = {100,200}, \quotedblbase = {300,300}, + \guillemotleft = {200,200}, \guillemotright = {150,300}, + \textbraceleft = {200, }, \textbraceright = { ,300}, + \textless = {100, }, \textgreater = { ,100} + } + +\SetProtrusion [ name = pmnx-OT1, load = pmnj-default ] { encoding = OT1, @@ -138,13 +172,19 @@ } \SetProtrusion + [ name = pmnx-T2A, + load = pmnj-T2A ] + { encoding = {T2A}, + family = pmnx } + { + 1 = {230,180} + } + +\SetProtrusion [ name = pmnj-it ] - { encoding = OT1, - family = pmnj, - shape = {it,sl} } + { } { A = {50, }, - \AE = { ,-50}, B = {20,-50}, C = {50,-50}, D = {20, }, @@ -158,7 +198,6 @@ M = { ,-30}, N = { ,-30}, O = {50, }, - \OE = {50, }, P = {20,-50}, Q = {50, }, R = {20, }, @@ -203,6 +242,17 @@ } \SetProtrusion + [ name = pmnj-it-OT1, + load = pmnj-it ] + { encoding = OT1, + family = pmnj, + shape = {it,sl} } + { + \AE = { ,-50}, + \OE = {50, } + } + +\SetProtrusion [ name = pmnj-it-T1, load = pmnj-it ] { encoding = {T1,LY1}, @@ -210,6 +260,8 @@ shape = {it,sl} } { _ = { ,100}, + \AE = { ,-50}, + \OE = { 50, }, 031 = { ,-100}, % ffl 156 = {20, }, % IJ 188 = { ,-30}, % ij @@ -225,6 +277,37 @@ } \SetProtrusion + [ name = pmnj-it-T2A, + load = pmnj-it ] + { encoding = T2A, + family = pmnj, + shape = {it,sl} } + { + \CYRA = {50, }, + \CYRV = {20,-50}, + \CYRG = {10, }, + \CYRE = {20,-50}, + \CYRZ = {20,-50}, + \CYRI = { ,-30}, + \CYRK = {20, }, + \CYRM = { ,-30}, + \CYRO = {50, }, + \CYRR = {20,-50}, + \CYRS = {50, }, + \CYRT = {70, }, + \CYRU = {50, }, + \CYRYA = { ,20}, + \cyrr = {-50, }, + _ = { ,100}, + 031 = { ,-100}, % ffl + \v t = { ,100}, + \textbackslash = {100,150}, \quotedblbase = {150,500}, + \guillemotleft = {200,300}, \guillemotright = {150,400}, + \textbraceleft = {200, }, \textbraceright = { ,200}, + \textless = {100, }, \textgreater = { ,100} + } + +\SetProtrusion [ name = pmnx-it, load = pmnj-it ] { encoding = OT1, @@ -245,6 +328,16 @@ } \SetProtrusion + [ name = pmnx-it-T2A, + load = pmnj-it-T2A ] + { encoding = {T2A}, + family = pmnx, + shape = {it,sl} } + { + 1 = {100,150} + } + +\SetProtrusion [ name = pmnj-sc, load = pmnj-default ] { encoding = OT1, diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg index 7f2f2b6f8fb..90ed3babd15 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ppl.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg index 1dd68e1338f..a6bfbe3a209 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ptm.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg index d41fed9ff9b..0037aeed2ed 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-ugm.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. diff --git a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg index 9150baf9181..58d41b907cf 100644 --- a/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg +++ b/Master/texmf-dist/tex/latex/microtype/mt-zpeu.cfg @@ -10,7 +10,7 @@ %% %% The `microtype' package %% An interface to the micro-typographic extensions of pdfTeX -%% Copyright (c) 2004--2009 R Schlicht <w.m.l@gmx.net> +%% Copyright (c) 2004--2010 R Schlicht <w.m.l@gmx.net> %% %% 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 +20,8 @@ %% %% 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. %% %% ------------------------------------------------------------------------ %% This is a font-specific configuration file for the `microtype' package. |