diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi b/Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi index 081ae0f388c..8953c9b320b 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/font-lib.mkvi @@ -28,7 +28,6 @@ % helpers - \registerctxluafile{font-otr}{optimize} % opentype fontloader \registerctxluafile{font-web}{} % opentype fontloader \registerctxluafile{font-cff}{optimize} % quadratic outlines @@ -50,8 +49,19 @@ \registerctxluafile{font-otc}{} \registerctxluafile{font-oth}{} \registerctxluafile{font-osd}{} -% \doifelsefileexists{font-osm.lua}{\registerctxluafile{font-osm}{}}{} -\registerctxluafile{font-ocl}{} +%registerctxluafile{font-osm}{} + +\ifcase\contextlmtxmode + \ifnum\luatexversion>111 + \doifelsefileexists{font-ocm.lua} + {\registerctxluafile{font-ocm}{}} % mkiv new + {\registerctxluafile{font-ocl}{}} + \else + \registerctxluafile{font-ocl}{} % generic (will become luatex-fonts-ocl) + \fi +\else + \registerctxluafile{font-ogr}{} % lmtx +\fi % we use otf code for type one @@ -61,12 +71,8 @@ % tfm -\doifelsefileexists {font-tpk.lua} { - \registerctxluafile{font-tpk}{optimize} - \registerctxluafile{font-tfm}{} -} { - \registerctxluafile{font-tfm}{} -} +\registerctxluafile{font-tpk}{optimize} +\registerctxluafile{font-tfm}{} % name database @@ -111,6 +117,7 @@ \registerctxluafile{font-imp-quality}{} \registerctxluafile{font-imp-italics}{} \registerctxluafile{font-imp-dimensions}{} +\registerctxluafile{font-imp-spacekerns}{} \doifelsefileexists{font-imp-scripts.lua} { \registerctxluafile{font-imp-scripts}{} @@ -153,5 +160,21 @@ \def\cleanfontname #1{\clf_cleanfontname{#1}} \unexpanded\def\setfontofid #1{\clf_setfontofid\numexpr#1\relax} +% this is an ugly hack needed for postponed inclusion stuff ... don't try +% to understand this ... these are kind of old mkiv solutions + +\unexpanded\def\typethreefont#1{\setfontid#1\relax} +\unexpanded\def\typethreechar#1{\char#1\hskip-\fontcharwd\font#1\relax} +\unexpanded\def\typethreelast#1{\char#1\relax} +\unexpanded\def\typethreecode#1{\pdfliteral direct {#1}} + +\newtoks\typethreetoks +\let \typethreemacro\empty + +\typethreetoks {% + \setbox\zerocount\hpack{\typethreemacro}% + \setbox\zerocount\hpack{\raise\dp\zerocount\box\zerocount}% +} + \protect \endinput |