From 9da04bd6fa363277da00d82aa369e51a2e4202ae Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 27 Oct 2009 16:35:00 +0100 Subject: stable 2009.10.27 16:35 --- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/font-gds.lua | 34 ++++++-- tex/context/base/math-vfu.lua | 5 +- tex/context/base/s-fnt-26.tex | 73 ++++++++++++++++ tex/context/base/type-def.mkii | 128 ++++++++++++++++++++++++++++ tex/context/base/type-def.mkiv | 94 ++++++++++++++++++++ tex/context/base/type-def.tex | 128 ---------------------------- tex/context/base/type-otf.tex | 12 +-- tex/generic/context/luatex-fonts-merged.lua | 2 +- 12 files changed, 335 insertions(+), 149 deletions(-) create mode 100644 tex/context/base/s-fnt-26.tex create mode 100644 tex/context/base/type-def.mkii create mode 100644 tex/context/base/type-def.mkiv delete mode 100644 tex/context/base/type-def.tex (limited to 'tex') diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index e042744f9..59a72b9b0 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2009.10.26 17:23} +\newcontextversion{2009.10.27 16:35} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index d5284cd25..4373e668c 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -277,7 +277,7 @@ \loadmarkfile{enco-pfr} \loadmarkfile{type-ini} -\loadcorefile{type-def} +\loadmarkfile{type-def} %D Properties. Don't ask. diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 1a060d04f..1b6f205c1 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -250,7 +250,7 @@ \loadmarkfile{typo-cap} \loadmarkfile{type-ini} -\loadcorefile{type-def} +\loadmarkfile{type-def} \loadmarkfile{scrp-ini} diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index a1e671034..f1c0e900e 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2009.10.26 17:23} +\edef\contextversion{2009.10.27 16:35} %D For those who want to use this: diff --git a/tex/context/base/font-gds.lua b/tex/context/base/font-gds.lua index 9a59b404e..2a6d9f8e4 100644 --- a/tex/context/base/font-gds.lua +++ b/tex/context/base/font-gds.lua @@ -6,7 +6,6 @@ if not modules then modules = { } end modules ['font-gds'] = { license = "see context related readme files" } -local flattened= table.flattened local type, next = type, next local gmatch = string.gmatch @@ -37,6 +36,10 @@ local function getgoodies(filename) -- maybe a merge is better data[filename] = false -- signal for not found else goodies = dofile(fullname) or false + for name, fnc in next, list do + fnc(goodies) + end + goodies.initialized = true data[filename] = goodies end end @@ -60,12 +63,6 @@ function fonts.initializers.common.goodies(tfmdata,value) local ok = getgoodies(filename) if ok then goodies[#goodies+1] = ok - if not ok.initialized then - for name, fnc in next, list do - fnc(ok,tfmdata) - end - ok.initialized = true - end end end tfmdata.goodies = goodies -- shared ? @@ -73,6 +70,29 @@ end -- featuresets +local function flattened(t,tt) + -- first set value dominates + local tt = tt or { } + for i=1,#t do + local ti = t[i] + if type(ti) == "table" then + flattened(ti,tt) + elseif tt[ti] == nil then + tt[ti] = true + end + end + for k, v in next, t do + if type(k) ~= "number" then + if type(v) == "table" then + flattened(v,tt) + elseif tt[k] == nil then + tt[k] = v + end + end + end + return tt +end + local function initialize(goodies,tfmdata) local featuresets = goodies.featuresets local goodiesname = goodies.name diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua index 57fde4ddf..35c488a39 100644 --- a/tex/context/base/math-vfu.lua +++ b/tex/context/base/math-vfu.lua @@ -542,7 +542,6 @@ function fonts.vf.math.define(specification,set) main.has_italic = true main.type = "virtual" -- not needed mathematics.scaleparameters(main,main,1) ---~ main.name = nil -- crashes main.nomath = false return main end @@ -1632,8 +1631,8 @@ mathematics.make_font ( "utopia-math", { } ) mathematics.make_font ( "hvmath-math", { - { name = "texgyreheros-regular.otf", features = "virtualmath", main = true }, - { name = "hvrm108r.tfm", vector="tex-mr", features = "virtualmath", main = true }, + { name = "file:texgyreheros-regular.otf", features = "virtualmath", main = true }, + { name = "hvrm108r.tfm", vector="tex-mr" }, { name = "hvmi10.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "hvsy10.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, { name = "hvex10.tfm", vector = "tex-ex", extension = true }, diff --git a/tex/context/base/s-fnt-26.tex b/tex/context/base/s-fnt-26.tex new file mode 100644 index 000000000..026abf29b --- /dev/null +++ b/tex/context/base/s-fnt-26.tex @@ -0,0 +1,73 @@ +%D \module +%D [ file=s-fnt-26, +%D version=2009.10.26, +%D title=\CONTEXT\ Style File, +%D subtitle=Goodies Tables, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright=PRAGMA] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\startluacode + + function document.show_goodies_stylistics(name) + local goodies = fonts.goodies.get(name) + local stylistics = goodies and goodies.stylistics + if stylistics then + local col, row, type = context.NC, context.NR, context.type + context.starttabulate { "|l|pl|" } + col() context("feature") col() context("meaning") col() row() + for feature, meaning in table.sortedpairs(stylistics) do + col() type(feature) col() type(meaning) col() row() + end + context.stoptabulate() + end + end + + function document.show_goodies_featuresets(name) + local goodies = fonts.goodies.get(name) + local featuresets = goodies and goodies.featuresets + if featuresets then + local col, row, type = context.NC, context.NR, context.type + context.starttabulate { "|l|pl|" } + col() context("featureset") col() context("definitions") col() row() + for featureset, definitions in table.sortedpairs(featuresets) do + col() type(featureset) col() + for k, v in table.sortedpairs(definitions) do + type(string.format("%s=%s",k,tostring(v))) + context.quad() + end + col() row() + end + context.stoptabulate() + end + end + + function document.show_goodies_colorschemes(name) + local goodies = fonts.goodies.get(name) + local colorschemes = goodies and goodies.colorschemes + if colorschemes then + local col, row, type = context.NC, context.NR, context.type + context.starttabulate { "|l|pl|" } + col() context("colorscheme") col() context("numbers") col() row() + for colorscheme, numbers in table.sortedpairs(colorschemes) do + col() type(colorscheme) col() + for i=1,#numbers do + type(i) + context.quad() + end + col() row() + end + context.stoptabulate() + end + +\stopluacode + +\def\showgoodiesstylistics #1{\ctxlua{document.show_goodies_stylistics ("#1")}} +\def\showgoodiesfeaturesets #1{\ctxlua{document.show_goodies_featuresets ("#1")}} +\def\showgoodiescolorschemes#1{\ctxlua{document.show_goodies_colorschemes("#1")}} + +\endinput diff --git a/tex/context/base/type-def.mkii b/tex/context/base/type-def.mkii new file mode 100644 index 000000000..6469a5925 --- /dev/null +++ b/tex/context/base/type-def.mkii @@ -0,0 +1,128 @@ +%D \module +%D [ file=type-def, +%D version=2005.02.04, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Default Definitions, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\definetypescriptprefix [serif] [Serif] +\definetypescriptprefix [sans] [Sans] +\definetypescriptprefix [mono] [Mono] + +\definefontsynonym [DefaultFont] [cmvtt10] + +\startsetups [font:fallback:serif] + \definefontsynonym [Serif] [DefaultFont] + \definefontsynonym [SerifBold] [Serif] + \definefontsynonym [SerifItalic] [Serif] + \definefontsynonym [SerifSlanted] [SerifItalic] + \definefontsynonym [SerifBoldItalic] [Serif] + \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic] + \definefontsynonym [SerifCaps] [Serif] +\stopsetups + +\startsetups [font:fallback:sans] + \definefontsynonym [Sans] [DefaultFont] + \definefontsynonym [SansBold] [Sans] + \definefontsynonym [SansItalic] [Sans] + \definefontsynonym [SansSlanted] [SansItalic] + \definefontsynonym [SansBoldItalic] [Sans] + \definefontsynonym [SansBoldSlanted] [SansBoldItalic] + \definefontsynonym [SansCaps] [Sans] +\stopsetups + +\startsetups [font:fallback:mono] + \definefontsynonym [Mono] [DefaultFont] + \definefontsynonym [MonoBold] [Mono] + \definefontsynonym [MonoItalic] [Mono] + \definefontsynonym [MonoSlanted] [MonoItalic] + \definefontsynonym [MonoBoldItalic] [Mono] + \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic] + \definefontsynonym [MonoCaps] [Mono] +\stopsetups + +\startsetups [font:allbold:serif] + \definefontsynonym [Serif] [SerifBold] + \definefontsynonym [SerifItalic] [SerifBoldItalic] + \definefontsynonym [SerifSlanted] [SerifBoldSlanted] + %definefontsynonym [SerifCaps] [SerifBold] +\stopsetups + +\startsetups [font:allbold:sans] + \definefontsynonym [Sans] [SansBold] + \definefontsynonym [SansItalic] [SansBoldItalic] + \definefontsynonym [SansSlanted] [SansBoldSlanted] + %definefontsynonym [SansCaps] [SansBold] +\stopsetups + +\starttypescript [serif] [simple] [name] + \definefontsynonym [Serif] [Simple] + \definefontsynonym [SerifBold] [Serif] + \definefontsynonym [SerifItalic] [Serif] + \definefontsynonym [SerifSlanted] [Serif] + \definefontsynonym [SerifBoldItalic] [Serif] + \definefontsynonym [SerifBoldSlanted] [Serif] + \definefontsynonym [SerifCaps] [Serif] +\stoptypescript + +\starttypescript [sans] [simple] [name] + \definefontsynonym [Sans] [Simple] + \definefontsynonym [SansBold] [Sans] + \definefontsynonym [SansItalic] [Sans] + \definefontsynonym [SansSlanted] [Sans] + \definefontsynonym [SansBoldItalic] [Sans] + \definefontsynonym [SansBoldSlanted] [Sans] + \definefontsynonym [SansCaps] [Sans] +\stoptypescript + +\starttypescript [mono] [simple] [name] + \definefontsynonym [Mono] [Simple] + \definefontsynonym [MonoBold] [Mono] + \definefontsynonym [MonoItalic] [Mono] + \definefontsynonym [MonoSlanted] [Mono] + \definefontsynonym [MonoBoldItalic] [Mono] + \definefontsynonym [MonoBoldSlanted] [Mono] + \definefontsynonym [MonoCaps] [Mono] +\stoptypescript + +% handy + +% \starttypescript [serif] [simple] [name] +% \definefontsynonym [Simple] [cmvtt10] +% \setupfontsynonym [Simple] [handling=pure] +% \stoptypescript + +\starttypescript [serif,sans,mono] [handling,hanging] [pure,normal] + \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree bold] + \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree slanted] + \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree italic] + \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree boldslanted] + \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree bolditalic] +\stoptypescript + +\starttypescript [serif,sans,mono] [handling,hz] [hz,quality,highquality] + \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree] +\stoptypescript + +\starttypescript [serif,sans,mono] [handling] [noligs,prespacing,flexspacing] + \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree] + \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree] +\stoptypescript + +\endinput diff --git a/tex/context/base/type-def.mkiv b/tex/context/base/type-def.mkiv new file mode 100644 index 000000000..748e3d66f --- /dev/null +++ b/tex/context/base/type-def.mkiv @@ -0,0 +1,94 @@ +%D \module +%D [ file=type-def, +%D version=2005.02.04, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Default Definitions, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\definetypescriptprefix [serif] [Serif] +\definetypescriptprefix [sans] [Sans] +\definetypescriptprefix [mono] [Mono] + +\definefontsynonym [DefaultFont] [cmvtt10] + +\startsetups [font:fallback:serif] + \definefontsynonym [Serif] [DefaultFont] + \definefontsynonym [SerifBold] [Serif] + \definefontsynonym [SerifItalic] [Serif] + \definefontsynonym [SerifSlanted] [SerifItalic] + \definefontsynonym [SerifBoldItalic] [Serif] + \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic] + \definefontsynonym [SerifCaps] [Serif] +\stopsetups + +\startsetups [font:fallback:sans] + \definefontsynonym [Sans] [DefaultFont] + \definefontsynonym [SansBold] [Sans] + \definefontsynonym [SansItalic] [Sans] + \definefontsynonym [SansSlanted] [SansItalic] + \definefontsynonym [SansBoldItalic] [Sans] + \definefontsynonym [SansBoldSlanted] [SansBoldItalic] + \definefontsynonym [SansCaps] [Sans] +\stopsetups + +\startsetups [font:fallback:mono] + \definefontsynonym [Mono] [DefaultFont] + \definefontsynonym [MonoBold] [Mono] + \definefontsynonym [MonoItalic] [Mono] + \definefontsynonym [MonoSlanted] [MonoItalic] + \definefontsynonym [MonoBoldItalic] [Mono] + \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic] + \definefontsynonym [MonoCaps] [Mono] +\stopsetups + +\startsetups [font:allbold:serif] + \definefontsynonym [Serif] [SerifBold] + \definefontsynonym [SerifItalic] [SerifBoldItalic] + \definefontsynonym [SerifSlanted] [SerifBoldSlanted] + %definefontsynonym [SerifCaps] [SerifBold] +\stopsetups + +\startsetups [font:allbold:sans] + \definefontsynonym [Sans] [SansBold] + \definefontsynonym [SansItalic] [SansBoldItalic] + \definefontsynonym [SansSlanted] [SansBoldSlanted] + %definefontsynonym [SansCaps] [SansBold] +\stopsetups + +\starttypescript [serif] [simple] [name] + \definefontsynonym [Serif] [Simple] + \definefontsynonym [SerifBold] [Serif] + \definefontsynonym [SerifItalic] [Serif] + \definefontsynonym [SerifSlanted] [Serif] + \definefontsynonym [SerifBoldItalic] [Serif] + \definefontsynonym [SerifBoldSlanted] [Serif] + \definefontsynonym [SerifCaps] [Serif] +\stoptypescript + +\starttypescript [sans] [simple] [name] + \definefontsynonym [Sans] [Simple] + \definefontsynonym [SansBold] [Sans] + \definefontsynonym [SansItalic] [Sans] + \definefontsynonym [SansSlanted] [Sans] + \definefontsynonym [SansBoldItalic] [Sans] + \definefontsynonym [SansBoldSlanted] [Sans] + \definefontsynonym [SansCaps] [Sans] +\stoptypescript + +\starttypescript [mono] [simple] [name] + \definefontsynonym [Mono] [Simple] + \definefontsynonym [MonoBold] [Mono] + \definefontsynonym [MonoItalic] [Mono] + \definefontsynonym [MonoSlanted] [Mono] + \definefontsynonym [MonoBoldItalic] [Mono] + \definefontsynonym [MonoBoldSlanted] [Mono] + \definefontsynonym [MonoCaps] [Mono] +\stoptypescript + +\endinput diff --git a/tex/context/base/type-def.tex b/tex/context/base/type-def.tex deleted file mode 100644 index 6469a5925..000000000 --- a/tex/context/base/type-def.tex +++ /dev/null @@ -1,128 +0,0 @@ -%D \module -%D [ file=type-def, -%D version=2005.02.04, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Default Definitions, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\definetypescriptprefix [serif] [Serif] -\definetypescriptprefix [sans] [Sans] -\definetypescriptprefix [mono] [Mono] - -\definefontsynonym [DefaultFont] [cmvtt10] - -\startsetups [font:fallback:serif] - \definefontsynonym [Serif] [DefaultFont] - \definefontsynonym [SerifBold] [Serif] - \definefontsynonym [SerifItalic] [Serif] - \definefontsynonym [SerifSlanted] [SerifItalic] - \definefontsynonym [SerifBoldItalic] [Serif] - \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic] - \definefontsynonym [SerifCaps] [Serif] -\stopsetups - -\startsetups [font:fallback:sans] - \definefontsynonym [Sans] [DefaultFont] - \definefontsynonym [SansBold] [Sans] - \definefontsynonym [SansItalic] [Sans] - \definefontsynonym [SansSlanted] [SansItalic] - \definefontsynonym [SansBoldItalic] [Sans] - \definefontsynonym [SansBoldSlanted] [SansBoldItalic] - \definefontsynonym [SansCaps] [Sans] -\stopsetups - -\startsetups [font:fallback:mono] - \definefontsynonym [Mono] [DefaultFont] - \definefontsynonym [MonoBold] [Mono] - \definefontsynonym [MonoItalic] [Mono] - \definefontsynonym [MonoSlanted] [MonoItalic] - \definefontsynonym [MonoBoldItalic] [Mono] - \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic] - \definefontsynonym [MonoCaps] [Mono] -\stopsetups - -\startsetups [font:allbold:serif] - \definefontsynonym [Serif] [SerifBold] - \definefontsynonym [SerifItalic] [SerifBoldItalic] - \definefontsynonym [SerifSlanted] [SerifBoldSlanted] - %definefontsynonym [SerifCaps] [SerifBold] -\stopsetups - -\startsetups [font:allbold:sans] - \definefontsynonym [Sans] [SansBold] - \definefontsynonym [SansItalic] [SansBoldItalic] - \definefontsynonym [SansSlanted] [SansBoldSlanted] - %definefontsynonym [SansCaps] [SansBold] -\stopsetups - -\starttypescript [serif] [simple] [name] - \definefontsynonym [Serif] [Simple] - \definefontsynonym [SerifBold] [Serif] - \definefontsynonym [SerifItalic] [Serif] - \definefontsynonym [SerifSlanted] [Serif] - \definefontsynonym [SerifBoldItalic] [Serif] - \definefontsynonym [SerifBoldSlanted] [Serif] - \definefontsynonym [SerifCaps] [Serif] -\stoptypescript - -\starttypescript [sans] [simple] [name] - \definefontsynonym [Sans] [Simple] - \definefontsynonym [SansBold] [Sans] - \definefontsynonym [SansItalic] [Sans] - \definefontsynonym [SansSlanted] [Sans] - \definefontsynonym [SansBoldItalic] [Sans] - \definefontsynonym [SansBoldSlanted] [Sans] - \definefontsynonym [SansCaps] [Sans] -\stoptypescript - -\starttypescript [mono] [simple] [name] - \definefontsynonym [Mono] [Simple] - \definefontsynonym [MonoBold] [Mono] - \definefontsynonym [MonoItalic] [Mono] - \definefontsynonym [MonoSlanted] [Mono] - \definefontsynonym [MonoBoldItalic] [Mono] - \definefontsynonym [MonoBoldSlanted] [Mono] - \definefontsynonym [MonoCaps] [Mono] -\stoptypescript - -% handy - -% \starttypescript [serif] [simple] [name] -% \definefontsynonym [Simple] [cmvtt10] -% \setupfontsynonym [Simple] [handling=pure] -% \stoptypescript - -\starttypescript [serif,sans,mono] [handling,hanging] [pure,normal] - \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree bold] - \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree slanted] - \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree italic] - \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree boldslanted] - \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree bolditalic] -\stoptypescript - -\starttypescript [serif,sans,mono] [handling,hz] [hz,quality,highquality] - \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree] -\stoptypescript - -\starttypescript [serif,sans,mono] [handling] [noligs,prespacing,flexspacing] - \setupfontsynonym [\typescriptprefix\typescriptone ] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Bold] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Slanted] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone Italic] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone BoldSlanted] [handling=\typescriptthree] - \setupfontsynonym [\typescriptprefix\typescriptone BoldItalic] [handling=\typescriptthree] -\stoptypescript - -\endinput diff --git a/tex/context/base/type-otf.tex b/tex/context/base/type-otf.tex index 720ffbaf9..bc296976b 100644 --- a/tex/context/base/type-otf.tex +++ b/tex/context/base/type-otf.tex @@ -94,17 +94,17 @@ \starttypescript [schoolbook,schola] \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] - \definetypeface [\typescriptone] [ss] [sans] [modern] [default] - \definetypeface [\typescriptone] [tt] [mono] [modern] [default] - \definetypeface [\typescriptone] [mm] [math] [modern] [default] + \definetypeface [\typescriptone] [ss] [sans] [modern] [default] [rscale=1.1] + \definetypeface [\typescriptone] [tt] [mono] [modern] [default] [rscale=1.1] + \definetypeface [\typescriptone] [mm] [math] [modern] [default] [rscale=1.1] \quittypescriptscanning \stoptypescript \starttypescript [bookman,bonum] \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] - \definetypeface [\typescriptone] [ss] [sans] [modern] [default] - \definetypeface [\typescriptone] [tt] [mono] [modern] [default] - \definetypeface [\typescriptone] [mm] [math] [modern] [default] + \definetypeface [\typescriptone] [ss] [sans] [modern] [default] [rscale=1.1] + \definetypeface [\typescriptone] [tt] [mono] [modern] [default] [rscale=1.1] + \definetypeface [\typescriptone] [mm] [math] [modern] [default] [rscale=1.1] \quittypescriptscanning \stoptypescript diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 55eb2feac..5dba03893 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua --- merge date : 10/26/09 17:28:48 +-- merge date : 10/27/09 16:41:26 do -- begin closure to overcome local limits and interference -- cgit v1.2.3