diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/NEWS | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf | bin | 303438 -> 184675 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx | 64 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua | 33 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty | 2 |
5 files changed, 85 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/luatex/luaotfload/NEWS b/Master/texmf-dist/doc/luatex/luaotfload/NEWS index d5369fd725e..d3045473480 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/NEWS +++ b/Master/texmf-dist/doc/luatex/luaotfload/NEWS @@ -1,6 +1,13 @@ Change History -------------- +2010/07/15, luaotfload v1.18: + * fix for \overwithdelims and brothers + +2010/07/14, luaotfload v1.17: + * allow stylistic sets features in base mode + * don't scale percent math constants + 2010/07/12, luaotfload v1.16: * support keys prefixed by "+", for compatibility with XeTeX * remove the progress bar from mkluatexfontdb, it is of little use now diff --git a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf Binary files differindex 52c50219d09..fbbb282ff09 100644 --- a/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf +++ b/Master/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf diff --git a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx index 6c68db17c03..7defe35ae7d 100644 --- a/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx +++ b/Master/texmf-dist/source/luatex/luaotfload/luaotfload.dtx @@ -35,7 +35,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luaotfload 2010/07/12 v1.16 ConTeXt font loading system} +\Msg{* Package: luaotfload 2010/07/15 v1.18 OpenType layout system} \Msg{************************************************************************} \keepsilent @@ -102,10 +102,23 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luaotfload.drv}% - [2010/07/12 v1.16 ConTeXt font loading system]% + [2010/07/15 v1.18 OpenType layout system]% \documentclass{ltxdoc} -\usepackage{metalogo,multicol,mdwlist,fancyvrb} -\usepackage[colorlinks=true]{hyperref} +\usepackage{metalogo,multicol,mdwlist,fancyvrb,xcolor} +\usepackage{charter} +\usepackage[ + bookmarks=true, + colorlinks=true, + linkcolor=niceblue, +% urlcolor=niceblue, + citecolor=niceblue, + pdftitle={The luaotfload package}, + pdfsubject={OpenType layout system for Plain TeX and LaTeX}, + pdfauthor={Elie Roux & Khaled Hosny}, + pdfkeywords={luatex, lualatex, unicode, opentype} + ]{hyperref} + +\definecolor{niceblue}{rgb}{0.4,0.6,1.000} \def\LuaTeX{Lua\TeX} \def\ConTeXt{Con\TeX t} @@ -140,7 +153,7 @@ and the derived files % \GetFileInfo{luaotfload.drv} % % \title{The \textsf{luaotfload} package} -% \date{2010/07/12 v1.16} +% \date{2010/07/15 v1.18} % \author{ Elie Roux\footnote{\texttt{elie.roux@telecom-bretagne.eu}} % \and Khaled Hosny\footnote{\texttt{khaledhosny@eglug.org}}} % @@ -437,9 +450,9 @@ module('luaotfload', package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.15, - date = "2010/07/12", - description = "ConTeXt font loading system.", + version = 1.18, + date = "2010/07/15", + description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", license = "CC0" @@ -651,14 +664,20 @@ local function def_font(...) % % \begin{macrocode} if otfdata.metadata.math then + local mc = { } for k,v in next, otfdata.metadata.math do - if k == "RadicalDegreeBottomRaisePercent" then - -- this is a percent - fontdata.MathConstants[k] = v + if k:find("Percent") then + -- keep percent values as is + mc[k] = v else - fontdata.MathConstants[k] = v / units * size + mc[k] = v / units * size end end + -- for \overwithdelims + mc["FractionDelimiterSize"] = 1.01 * size + mc["FractionDelimiterDisplayStyleSize"] = 2.39 * size + + fontdata.MathConstants = mc end end @@ -676,6 +695,25 @@ fonts.mode = "node" % \end{macrocode} % +% The following features are useful in math (e.g. in XITS Math font), +% but \textsf{luaotfload} does not recognize them in |base| mode. +% +% \begin{macrocode} + +local register_base_sub = fonts.otf.features.register_base_substitution +local gsubs = { + "ss01", "ss02", "ss03", "ss04", "ss05", + "ss06", "ss07", "ss08", "ss09", "ss10", + "ss11", "ss12", "ss13", "ss14", "ss15", + "ss16", "ss17", "ss18", "ss19", "ss20", +} + +for _,v in next, gsubs do + register_base_sub(v) +end + +% \end{macrocode} +% % Finally two functions % % \begin{macrocode} @@ -729,7 +767,7 @@ end \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2010/07/12 v1.16 ConTeXt font loading system] + [2010/07/15 v1.18 OpenType layout system] \RequirePackage{luatextra} \fi diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index 4cdbd127de6..fbfc6f3d2fd 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -20,9 +20,9 @@ module('luaotfload', package.seeall) luaotfload.module = { name = "luaotfload", - version = 1.15, - date = "2010/07/12", - description = "ConTeXt font loading system.", + version = 1.18, + date = "2010/07/15", + description = "OpenType layout system.", author = "Elie Roux & Hans Hagen", copyright = "Elie Roux", license = "CC0" @@ -136,14 +136,20 @@ local function def_font(...) end fontdata.parameters[8] = capheight if otfdata.metadata.math then + local mc = { } for k,v in next, otfdata.metadata.math do - if k == "RadicalDegreeBottomRaisePercent" then - -- this is a percent - fontdata.MathConstants[k] = v + if k:find("Percent") then + -- keep percent values as is + mc[k] = v else - fontdata.MathConstants[k] = v / units * size + mc[k] = v / units * size end end + -- for \overwithdelims + mc["FractionDelimiterSize"] = 1.01 * size + mc["FractionDelimiterDisplayStyleSize"] = 2.39 * size + + fontdata.MathConstants = mc end end @@ -153,6 +159,19 @@ end fonts.mode = "node" +local register_base_sub = fonts.otf.features.register_base_substitution +local gsubs = { + "ss01", "ss02", "ss03", "ss04", "ss05", + "ss06", "ss07", "ss08", "ss09", "ss10", + "ss11", "ss12", "ss13", "ss14", "ss15", + "ss16", "ss17", "ss18", "ss19", "ss20", +} + +for _,v in next, gsubs do + register_base_sub(v) +end + + function luaotfload.register_callbacks() luatexbase.add_to_callback('pre_linebreak_filter', nodes.simple_font_handler, diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index 65260b18e9b..bd347d6de8f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -24,7 +24,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luaotfload}% - [2010/07/12 v1.16 ConTeXt font loading system] + [2010/07/15 v1.18 OpenType layout system] \RequirePackage{luatextra} \fi |