diff options
author | Siep Kroonenberg <siepo@cybercomm.nl> | 2023-02-26 14:47:05 +0000 |
---|---|---|
committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2023-02-26 14:47:05 +0000 |
commit | f9897a2b35a4862f1f0ac5ea4e8702b3668588a5 (patch) | |
tree | 96ba243f29c1a3c8bb945d5f16b7996eb190b6ec /Master/texmf-dist/tex/context/fonts | |
parent | 63fa9cdb45000fcd36ad5bd0d594fbd1f57ec16e (diff) |
ConTeXt LMTX: tex
git-svn-id: svn://tug.org/texlive/trunk@66178 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/fonts')
75 files changed, 6038 insertions, 4281 deletions
diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-buy.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-buy.mkii deleted file mode 100644 index b8518acb0ea..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-buy.mkii +++ /dev/null @@ -1,571 +0,0 @@ -%D \module -%D [ file=type-buy, -%D version=2003.07.08, % 2001.04.12, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=A Few Commercial Fonts, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% fallback - -% todo \typescriptthree - -\starttypescriptcollection[commercial fonts] - -% Informal : Vulis - -\starttypescript [casual] [informal] [name] - \definefontsynonym [Serif] [Informal-Regular] - \definefontsynonym [SerifBold] [Informal-Bold] - \definefontsynonym [SerifSlanted] [Informal-Oblique] - \definefontsynonym [SerifItalic] [Informal-Oblique] - \definefontsynonym [SerifBoldSlanted] [Informal-BoldOblique] - \definefontsynonym [SerifBoldItalic] [Informal-BoldOblique] - \definefontsynonym [SerifCaps] [Informal-Regular] -\stoptypescript - -\starttypescript [math] [informal] [name] - \definefontsynonym [MathRoman] [Informal-Regular] - \definefontsynonym [MathExtension] [Informal-MathExtendedSymbols] - \definefontsynonym [MathItalic] [Informal-MathItalics] - \definefontsynonym [MathSymbol] [Informal-MathSymbols] -\stoptypescript - -\starttypescript [casual] [informal] [default] - \definefontsynonym [Informal-Regular] [ifrm10cm] - \definefontsynonym [Informal-Bold] [ifrb10cm] - \definefontsynonym [Informal-Oblique] [ifro10cm] - \definefontsynonym [Informal-BoldOblique] [ifbo10cm] - \loadmapfile[original-micropress-informal.map] -\stoptypescript - -\starttypescript [math] [informal] [default] - \definefontsynonym [Informal-Regular] [ifrm10cm] - \definefontsynonym [Informal-MathExtendedSymbols] [ifex10] - \definefontsynonym [Informal-MathItalics] [ifmi10] - \definefontsynonym [Informal-MathSymbols] [ifsy10] - \loadmapfile[original-micropress-informal.map] -\stoptypescript - -% ITC Officina - -\starttypescript [serif] [officina] [name] - \definefontsynonym [Serif] [OfficinaSerif-Book] - \definefontsynonym [SerifItalic] [OfficinaSerif-BookItalic] - \definefontsynonym [SerifSlanted] [OfficinaSerif-BookSlanted] - \definefontsynonym [SerifBold] [OfficinaSerif-Bold] - \definefontsynonym [SerifBoldItalic] [OfficinaSerif-BoldItalic] - \definefontsynonym [SerifBoldSlanted] [OfficinaSerif-BoldSlanted] - \definefontsynonym [SerifCaps] [OfficinaSerif-Caps] -\stoptypescript - -\starttypescript [sans] [officina] [name] - \definefontsynonym [Sans] [OfficinaSans-Book] - \definefontsynonym [SansItalic] [OfficinaSans-BookItalic] - \definefontsynonym [SansSlanted] [OfficinaSans-BookSlanted] - \definefontsynonym [SansBold] [OfficinaSans-Bold] - \definefontsynonym [SansBoldItalic] [OfficinaSans-BoldItalic] - \definefontsynonym [SansBoldSlanted] [OfficinaSans-BoldSlanted] - \definefontsynonym [SansCaps] [OfficinaSans-Caps] -\stoptypescript - -\starttypescript [serif] [officina] [texnansi,ec,8r] - \definefontsynonym [OfficinaSerif-Book] [\typescriptthree-ovbk] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-BookItalic] [\typescriptthree-ovwi] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-Bold] [\typescriptthree-ovb] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-BoldItalic] [\typescriptthree-ovbi] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-BookSlanted] [\typescriptthree-ovbk-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-BoldSlanted] [\typescriptthree-ovb-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSerif-Caps] [\typescriptthree-ovbk-capitalized-800] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-itc-officina.map] -\stoptypescript - -\starttypescript [sans] [officina] [texnansi,ec,8r] - \definefontsynonym [OfficinaSans-Book] [\typescriptthree-owbk] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-BookItalic] [\typescriptthree-owwi] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-Bold] [\typescriptthree-owb] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-BoldItalic] [\typescriptthree-owbi] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-BookSlanted] [\typescriptthree-owbk-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-BoldSlanted] [\typescriptthree-owb-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [OfficinaSans-Caps] [\typescriptthree-owbk-capitalized-800] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-itc-officina.map] -\stoptypescript - -% FontFont Meta - -\starttypescript [sans] [meta] [name] - \definefontsynonym [Sans] [MetaNormal-Roman] - \definefontsynonym [SansItalic] [MetaNormal-Italic] - \definefontsynonym [SansSlanted] [MetaNormal-Italic] - \definefontsynonym [SansBold] [MetaBold-Roman] - \definefontsynonym [SansBoldItalic] [MetaBold-Italic] - \definefontsynonym [SansBoldSlanted][MetaBold-Italic] - \definefontsynonym [SansCaps] [MetaNormal-Caps] -\stoptypescript - -\starttypescript [sans] [meta-medium] [name] - \definefontsynonym [Sans] [MetaMedium-Roman] - \definefontsynonym [SansItalic] [MetaMedium-Italic] - \definefontsynonym [SansSlanted] [MetaMedium-Italic] - \definefontsynonym [SansBold] [MetaBold-Roman] - \definefontsynonym [SansBoldItalic] [MetaBold-Italic] - \definefontsynonym [SansBoldSlanted][MetaBold-Italic] - \definefontsynonym [SansCaps] [MetaMedium-Caps] -\stoptypescript - -\starttypescript [sans] [meta-lf] [name] - \definefontsynonym [Sans] [MetaBookLF-Roman] - \definefontsynonym [SansBold] [MetaBoldLF-Roman] - \definefontsynonym [SansItalic] [MetaBookLF-Italic] - \definefontsynonym [SansBoldItalic] [MetaBoldLF-Italic] - \definefontsynonym [SansCaps] [MetaBookLF-Caps] -\stoptypescript - -\starttypescript [sans] [meta,meta-book] [texnansi,ec,8r] - \definefontsynonym [MetaBook-Roman] [\typescriptthree-mtbk] [encoding=\typescriptthree] - \definefontsynonym [MetaBook-Italic] [\typescriptthree-mtbki] [encoding=\typescriptthree] - \definefontsynonym [MetaBook-Caps] [\typescriptthree-mtbkc] [encoding=\typescriptthree] - \definefontsynonym [MetaBook-ItalicCaps] [\typescriptthree-mtbkic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-lf,meta-book-lf] [texnansi,ec,8r] - \definefontsynonym [MetaBookLF-Roman] [\typescriptthree-mtbkf] [encoding=\typescriptthree] - \definefontsynonym [MetaBookLF-Italic] [\typescriptthree-mtbkfi] [encoding=\typescriptthree] - \definefontsynonym [MetaBookLF-Caps] [\typescriptthree-mtbkfc] [encoding=\typescriptthree] - \definefontsynonym [MetaBookLF-ItalicCaps] [\typescriptthree-mtbkfic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta,meta-bold] [texnansi,ec,8r] - \definefontsynonym [MetaBold-Roman] [\typescriptthree-mtbd] [encoding=\typescriptthree] - \definefontsynonym [MetaBold-Italic] [\typescriptthree-mtbdi] [encoding=\typescriptthree] - \definefontsynonym [MetaBold-Caps] [\typescriptthree-mtbdc] [encoding=\typescriptthree] - \definefontsynonym [MetaBold-ItalicCaps] [\typescriptthree-mtbdic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-lf,meta-bold-lf] [texnansi,ec,8r] - \definefontsynonym [MetaBoldLF-Roman] [\typescriptthree-mtbdf] [encoding=\typescriptthree] - \definefontsynonym [MetaBoldLF-Italic] [\typescriptthree-mtbdfi] [encoding=\typescriptthree] - \definefontsynonym [MetaBoldLF-Caps] [\typescriptthree-mtbdfc] [encoding=\typescriptthree] - \definefontsynonym [MetaBoldLF-ItalicCaps] [\typescriptthree-mtbdfic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-normal] [texnansi,ec,8r] - \definefontsynonym [MetaNormal-Roman] [\typescriptthree-mtn] [encoding=\typescriptthree] - \definefontsynonym [MetaNormal-Italic] [\typescriptthree-mtni] [encoding=\typescriptthree] - \definefontsynonym [MetaNormal-Caps] [\typescriptthree-mtnc] [encoding=\typescriptthree] - \definefontsynonym [MetaNormal-ItalicCaps] [\typescriptthree-mtnic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-normal-lf] [texnansi,ec,8r] - \definefontsynonym [MetaNormalLF-Roman] [\typescriptthree-mtnf] [encoding=\typescriptthree] - \definefontsynonym [MetaNormalLF-Italic] [\typescriptthree-mtnfi] [encoding=\typescriptthree] - \definefontsynonym [MetaNormalLF-Caps] [\typescriptthree-mtnfc] [encoding=\typescriptthree] - \definefontsynonym [MetaNormalLF-ItalicCaps] [\typescriptthree-mtnfic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-medium] [texnansi,ec,8r] - \definefontsynonym [MetaMedium-Roman] [\typescriptthree-mtm] [encoding=\typescriptthree] - \definefontsynonym [MetaMedium-Italic] [\typescriptthree-mtmi] [encoding=\typescriptthree] - \definefontsynonym [MetaMedium-Caps] [\typescriptthree-mtmc] [encoding=\typescriptthree] - \definefontsynonym [MetaMedium-ItalicCaps] [\typescriptthree-mtmic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-medium-lf] [texnansi,ec,8r] - \definefontsynonym [MetaMediumLF-Roman] [\typescriptthree-mtmf] [encoding=\typescriptthree] - \definefontsynonym [MetaMediumLF-Italic] [\typescriptthree-mtmfi] [encoding=\typescriptthree] - \definefontsynonym [MetaMediumLF-Caps] [\typescriptthree-mtmfc] [encoding=\typescriptthree] - \definefontsynonym [MetaMediumLF-ItalicCaps] [\typescriptthree-mtmfic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-black] [texnansi,ec,8r] - \definefontsynonym [MetaBlack-Roman] [\typescriptthree-mtbl] [encoding=\typescriptthree] - \definefontsynonym [MetaBlack-Italic] [\typescriptthree-mtbli] [encoding=\typescriptthree] - \definefontsynonym [MetaBlack-Caps] [\typescriptthree-mtblc] [encoding=\typescriptthree] - \definefontsynonym [MetaBlack-ItalicCaps] [\typescriptthree-mtblic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [sans] [meta-black-lf] [texnansi,ec,8r] - \definefontsynonym [MetaBlackLF-Roman] [\typescriptthree-mtblf] [encoding=\typescriptthree] - \definefontsynonym [MetaBlackLF-Italic] [\typescriptthree-mtblfi] [encoding=\typescriptthree] - \definefontsynonym [MetaBlackLF-Caps] [\typescriptthree-mtblfc] [encoding=\typescriptthree] - \definefontsynonym [MetaBlackLF-ItalicCaps] [\typescriptthree-mtblfic] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -\starttypescript [expert] [meta] % incomplete - \definefontsynonym [MetaNormal-Expert] [mtnx] - \loadmapfile [\typescriptthree-fontfont-meta.map] -\stoptypescript - -%D Linotype Univers - -\starttypescript [sans] [univers,univers-light,univers-black] [name] - \definefontsynonym [Sans] [Univers] - \definefontsynonym [SansBold] [Univers-Bold] - \definefontsynonym [SansSlanted] [Univers-Oblique] - \definefontsynonym [SansBoldSlanted] [Univers-BoldOblique] -\stoptypescript - -\starttypescript [sans] [univers-light] [name] - \definefontsynonym [Sans] [Univers-Light] - \definefontsynonym [SansSlanted] [Univers-LightOblique] -\stoptypescript - -\starttypescript [sans] [univers-black] [name] - \definefontsynonym [Sans] [Univers-Black] - \definefontsynonym [SansSlanted] [Univers-BlackOblique] - \definefontsynonym [SansBold] [Univers-Black] - \definefontsynonym [SansBoldSlanted] [Univers-BlackOblique] -\stoptypescript - -\starttypescript [sans] [univers,univers-black,univers-light] [texnansi,ec,8r] - \definefontsynonym [Univers-Light] [\typescriptthree-lt50136] [encoding=\typescriptthree] - \definefontsynonym [Univers-LightOblique] [\typescriptthree-lt50137] [encoding=\typescriptthree] - \definefontsynonym [Univers] [\typescriptthree-lt50138] [encoding=\typescriptthree] - \definefontsynonym [Univers-Oblique] [\typescriptthree-lt50139] [encoding=\typescriptthree] - \definefontsynonym [Univers-Bold] [\typescriptthree-lt50140] [encoding=\typescriptthree] - \definefontsynonym [Univers-BoldOblique] [\typescriptthree-lt50141] [encoding=\typescriptthree] - \definefontsynonym [Univers-Black] [\typescriptthree-lt50142] [encoding=\typescriptthree] - \definefontsynonym [Univers-BlackOblique] [\typescriptthree-lt50143] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-linotype-univers.map] -\stoptypescript - -% mendoza - -\starttypescript [serif] [mendoza] [name] - \definefontsynonym [Serif] [MendozaRoman-Book] - \definefontsynonym [SerifCaps] [MendozaRoman-Book] - \definefontsynonym [SerifSlanted] [MendozaRoman-BookItalic] - \definefontsynonym [SerifItalic] [MendozaRoman-BookItalic] - \definefontsynonym [SerifBold] [MendozaRoman-Bold] - \definefontsynonym [SerifBoldSlanted] [MendozaRoman-BoldItalic] - \definefontsynonym [SerifBoldItalic] [MendozaRoman-BoldItalic] -\stoptypescript - -\starttypescript [serif] [mendoza] [ec,8r,texnansi] - \definefontsynonym[MendozaRoman-Bold] [\typescriptthree-zab] [encoding=\typescriptthree] - \definefontsynonym[MendozaRoman-BoldItalic] [\typescriptthree-zabi][encoding=\typescriptthree] - \definefontsynonym[MendozaRoman-Medium] [\typescriptthree-zam] [encoding=\typescriptthree] - \definefontsynonym[MendozaRoman-MediumItalic][\typescriptthree-zami][encoding=\typescriptthree] - \definefontsynonym[MendozaRoman-Book] [\typescriptthree-zaw] [encoding=\typescriptthree] - \definefontsynonym[MendozaRoman-BookItalic] [\typescriptthree-zawi][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-itc-mendoza.map] -\stoptypescript - -% frutiger - -\starttypescript [sans] [frutiger] [name] - \definefontsynonym [Sans] [Frutiger-Roman] - \definefontsynonym [SansCaps] [Frutiger-Roman] - \definefontsynonym [SansItalic] [Frutiger-Italic] - \definefontsynonym [SansSlanted] [Frutiger-Italic] - \definefontsynonym [SansBold] [Frutiger-Bold] - \definefontsynonym [SansBoldItalic] [Frutiger-BoldItalic] - \definefontsynonym [SansBoldSlanted] [Frutiger-BoldItalic] -\stoptypescript - -\starttypescript [sans] [frutiger] [ec,8r,texnansi] - \definefontsynonym[Frutiger-Bold] [\typescriptthree-ftb] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-BoldItalic] [\typescriptthree-ftbi] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-Black] [\typescriptthree-ftbl] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-BlackItalic][\typescriptthree-ftbli][encoding=\typescriptthree] - \definefontsynonym[Frutiger-Italic] [\typescriptthree-fti] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-Light] [\typescriptthree-ftl] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-LightItalic][\typescriptthree-ftli] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-Roman] [\typescriptthree-ftr] [encoding=\typescriptthree] - \definefontsynonym[Frutiger-UltraBlack] [\typescriptthree-ftubl][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-adobe-frutiger.map] -\stoptypescript - -\starttypescript [frutiger] [texnansi,ec,8r,uc] - \definetypeface [frutiger] [ss] [sans] [frutiger] [default] [encoding=\typescripttwo] -% \loadmapfile [\typescripttwo-adobe-frutiger.map] -\stoptypescript - -% kabel - -\starttypescript [sans] [kabel] [ec,8r,texnansi] - \definefontsynonym [ItcKabel-Bold] [\typescriptthree-kbb] [encoding=\typescriptthree] - \definefontsynonym [ItcKabel-Demi] [\typescriptthree-kbd] [encoding=\typescriptthree] - \definefontsynonym [ItcKabel-Medium] [\typescriptthree-kbm] [encoding=\typescriptthree] - \definefontsynonym [ItcKabel-Ultra] [\typescriptthree-kbu] [encoding=\typescriptthree] - \definefontsynonym [ItcKabel-Book] [\typescriptthree-kbw] [encoding=\typescriptthree] - \loadmapfile [\typescriptthree-itc-kabel.map] -\stoptypescript - -% thesans - -\starttypescript [sans] [thesans] [name] - \definefontsynonym [Sans] [TheSans-Plain] - \definefontsynonym [SansItalic] [TheSans-Italic] - \definefontsynonym [SansSlanted] [TheSans-Italic] - \definefontsynonym [SansBold] [TheSansBold-Plain] - \definefontsynonym [SansBoldItalic] [TheSansBold-Italic] - \definefontsynonym [SansBoldSlanted] [TheSansBold-Italic] - \definefontsynonym [SansCaps] [TheSans-Caps] - \definefontsynonym [SansCapsItalic] [TheSans-CapsItalic] - \definefontsynonym [SansCapsSlanted] [TheSans-CapsItalic] - \definefontsynonym [SansCapsBold] [TheSansBold-Caps] - \definefontsynonym [SansCapsBoldItalic] [TheSansBold-CapsItalic] - \definefontsynonym [SansCapsBoldSlanted] [TheSansBold-CapsItalic] -\stoptypescript - -\starttypescript [mono] [thesans] [name] - \definefontsynonym [Mono] [TheSansTypewriter-Plain] - \definefontsynonym [MonoCaps] [TheSansTypewriter-Plain] - \definefontsynonym [MonoItalic] [TheSansTypewriter-Italic] - \definefontsynonym [MonoSlanted] [TheSansTypewriter-Italic] - \definefontsynonym [MonoBold] [TheSansTypewriter-Bold] - \definefontsynonym [MonoBoldItalic] [TheSansTypewriter-BoldItalic] - \definefontsynonym [MonoBoldSlanted] [TheSansTypewriter-BoldItalic] -\stoptypescript - -\starttypescript [sans] [thesans] [ec,8r,texnansi] - \definefontsynonym [TheSans-Plain] [\typescriptthree-tsan5] [encoding=\typescriptthree] - \definefontsynonym [TheSans-Italic] [\typescriptthree-tsan5i] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-Plain] [\typescriptthree-tsan7] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-Italic] [\typescriptthree-tsan7i] [encoding=\typescriptthree] - \definefontsynonym [TheSans-Caps] [\typescriptthree-tsan5c] [encoding=\typescriptthree] - \definefontsynonym [TheSans-CapsItalic] [\typescriptthree-tsan5ci] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-Caps] [\typescriptthree-tsan7c] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-CapsItalic] [\typescriptthree-tsan7ci] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-lucas-thesans.map] -\stoptypescript - -\starttypescript [mono] [thesans] [ec,8r,texnansi] - \definefontsynonym [TheSansTypewriter-Plain] [\typescriptthree-tsaty5] [encoding=\typescriptthree] - \definefontsynonym [TheSansTypewriter-Italic] [\typescriptthree-tsaty5i] [encoding=\typescriptthree] - \definefontsynonym [TheSansTypewriter-Bold] [\typescriptthree-tsaty7] [encoding=\typescriptthree] - \definefontsynonym [TheSansTypewriter-BoldItalic] [\typescriptthree-tsaty7i] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-lucas-thesans.map] -\stoptypescript - -\starttypescript [expert] [thesans] - \definefontsynonym [TheSans-Expert] [tsan5e] [encoding=\typescriptthree] - \definefontsynonym [TheSans-ExpertItalic] [tsan5ei] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-Expert] [tsan7e] [encoding=\typescriptthree] - \definefontsynonym [TheSansBold-ExpertItalic] [tsan7ei] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-lucas-thesans.map] -\stoptypescript - -% monotype sabon - -\starttypescript [serif] [sabon] [name] - \definefontsynonym [Serif] [SabonMT] - \definefontsynonym [SerifItalic] [SabonMT-Italic] - \definefontsynonym [SerifSlanted] [SabonMT-Italic] - \definefontsynonym [SerifBold] [SabonMT-SemiBold] - \definefontsynonym [SerifBoldItalic] [SabonMT-SemiBoldItalic] - \definefontsynonym [SerifBoldSlanted] [SabonMT-SemiBoldItalic] - \definefontsynonym [SerifCaps] [SabonMT-RegularSC] -\stoptypescript - -\starttypescript [serif] [sabon] [ec,8r,texnansi] - \definefontsynonym[SabonMT] [\typescriptthree-sab] [encoding=\typescriptthree] - \definefontsynonym[SabonMT-Italic] [\typescriptthree-sabi] [encoding=\typescriptthree] - \definefontsynonym[SabonMT-ItalicOsF] [\typescriptthree-saboi][encoding=\typescriptthree] - \definefontsynonym[SabonMT-SemiBoldOsF] [\typescriptthree-sabos][encoding=\typescriptthree] - \definefontsynonym[SabonMT-SemiBold] [\typescriptthree-sabs] [encoding=\typescriptthree] - \definefontsynonym[SabonMT-RegularSC] [\typescriptthree-sabsc][encoding=\typescriptthree] - \definefontsynonym[SabonMT-SemiBoldItalic] [\typescriptthree-sabsi][encoding=\typescriptthree] - \definefontsynonym[SabonMT-SemiBoldItalicOsF][\typescriptthree-sasio][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-monotype-sabon.map] -\stoptypescript - -% itc stone - -\starttypescript [sans] [stone] [name] - \definefontsynonym [Sans] [StoneSansITC-Medium] - \definefontsynonym [SansItalic] [StoneSansITC-MediumItalic] - \definefontsynonym [SansSlanted] [StoneSansITC-MediumItalic] - \definefontsynonym [SansBold] [StoneSansITC-Bold] - \definefontsynonym [SansBoldItalic] [StoneSansITC-BoldItalic] - \definefontsynonym [SansBoldSlanted] [StoneSansITC-BoldItalic] - \definefontsynonym [SansCaps] [StoneSansSCITC-Medium] -\stoptypescript - -\starttypescript [serif] [stone] [name] - \definefontsynonym [Serif] [StoneSerifITC-Medium] - \definefontsynonym [SerifItalic] [StoneSerifITC-MediumItalic] - \definefontsynonym [SerifSlanted] [StoneSerifITC-MediumItalic] - \definefontsynonym [SerifBold] [StoneSerifITC-Bold] - \definefontsynonym [SerifBoldItalic] [StoneSerifITC-BoldItalic] - \definefontsynonym [SerifBoldSlanted] [StoneSerifITC-BoldItalic] - \definefontsynonym [SerifCaps] [StoneSerifSCITC-Medium] -\stoptypescript - -\starttypescript [sans] [stone-oldstyle] [name] - \definefontsynonym [Sans] [StoneSansOSITC-Medium] - \definefontsynonym [SansItalic] [StoneSansOSITC-MediumItalic] - \definefontsynonym [SansSlanted] [StoneSansOSITC-MediumItalic] - \definefontsynonym [SansBold] [StoneSansOSITC-Bold] - \definefontsynonym [SansBoldItalic] [StoneSansOSITC-BoldItalic] - \definefontsynonym [SansBoldSlanted] [StoneSansOSITC-BoldItalic] - \definefontsynonym [SansCaps] [StoneSansSCITC-Medium] -\stoptypescript - -\starttypescript [serif] [stone-oldstyle] [name] - \definefontsynonym [Serif] [StoneSerifOSITC-Medium] - \definefontsynonym [SerifItalic] [StoneSerifOSITC-MediumItalic] - \definefontsynonym [SerifSlanted] [StoneSerifOSITC-MediumItalic] - \definefontsynonym [SerifBold] [StoneSerifOSITC-Bold] - \definefontsynonym [SerifBoldItalic] [StoneSerifOSITC-BoldItalic] - \definefontsynonym [SerifBoldSlanted] [StoneSerifOSITC-BoldItalic] - \definefontsynonym [SerifCaps] [StoneSerifSCITC-Medium] -\stoptypescript - -\starttypescript [sans] [stone] [ec,texnansi] - \definefontsynonym[StoneSansITC-Bold] [\typescriptthree-stosnb] [encoding=\typescriptthree] - \definefontsynonym[StoneSansITC-BoldItalic] [\typescriptthree-stosnbi] [encoding=\typescriptthree] - \definefontsynonym[StoneSansITC-Medium] [\typescriptthree-stosnm] [encoding=\typescriptthree] - \definefontsynonym[StoneSansITC-MediumItalic] [\typescriptthree-stosnmi] [encoding=\typescriptthree] - \definefontsynonym[StoneSansOSITC-Bold] [\typescriptthree-stosnob] [encoding=\typescriptthree] - \definefontsynonym[StoneSansOSITC-BoldItalic] [\typescriptthree-stosnobi][encoding=\typescriptthree] - \definefontsynonym[StoneSansOSITC-Medium] [\typescriptthree-stosnom] [encoding=\typescriptthree] - \definefontsynonym[StoneSansOSITC-MediumItalic][\typescriptthree-stosnomi][encoding=\typescriptthree] - \definefontsynonym[StoneSansSCITC-Medium] [\typescriptthree-stosnscm][encoding=\typescriptthree] - \definefontsynonym[StoneSansSemITC-Semi] [\typescriptthree-stosns] [encoding=\typescriptthree] - \definefontsynonym[StoneSansSemITC-SemiIta] [\typescriptthree-stosnsi] [encoding=\typescriptthree] - \definefontsynonym[StoneSansSemOSITC-Semi] [\typescriptthree-stosnos] [encoding=\typescriptthree] - \definefontsynonym[StoneSansSemOSITC-SemiIta] [\typescriptthree-stosnosi][encoding=\typescriptthree] - \definefontsynonym[StoneSansSemSCITC-Semi] [\typescriptthree-stosnscs][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-itc-stone.map] -\stoptypescript - -\starttypescript [serif] [stone] [ec,texnansi] - \definefontsynonym[StoneSerifITC-Bold] [\typescriptthree-stosfb] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifITC-BoldItalic] [\typescriptthree-stosfbi] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifITC-Medium] [\typescriptthree-stosfm] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifITC-MediumItalic] [\typescriptthree-stosfmi] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifOSITC-Bold] [\typescriptthree-stosfob] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifOSITC-BoldItalic] [\typescriptthree-stosfobi][encoding=\typescriptthree] - \definefontsynonym[StoneSerifOSITC-Medium] [\typescriptthree-stosfom] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifOSITC-MediumItalic][\typescriptthree-stosfomi][encoding=\typescriptthree] - \definefontsynonym[StoneSerifSCITC-Medium] [\typescriptthree-stosfscm][encoding=\typescriptthree] - \definefontsynonym[StoneSerifSemITC-Semi] [\typescriptthree-stosfs] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifSemITC-SemiIta] [\typescriptthree-stosfsi] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifSemOSITC-Semi] [\typescriptthree-stosfos] [encoding=\typescriptthree] - \definefontsynonym[StoneSerifSemOSITC-SemiIta] [\typescriptthree-stosfosi][encoding=\typescriptthree] - \definefontsynonym[StoneSerifSemSCITC-Semi] [\typescriptthree-stosfscs][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-itc-stone.map] -\stoptypescript - -% linotype industria - -\starttypescript [sans] [industria] [ec,texnansi] - \definefontsynonym[Industria-Solid][\typescriptthree-lt50545][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-linotype-industria.map] -\stoptypescript - -% itc bauhaus -% -% texfont --enc=texnansi --ven=itc --col=bauhaus type-buy.dat - -\starttypescript [sans] [bauhaus] [ec,texnansi] - \definefontsynonym[Bauhaus-Light] [\typescriptthree-bhl] [encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Medium] [\typescriptthree-bhm] [encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Demi] [\typescriptthree-bhd] [encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Bold] [\typescriptthree-bhb] [encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Heavy] [\typescriptthree-bhh] [encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Bold-Slanted] [\typescriptthree-bhb-slanted-167][encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Demi-Slanted] [\typescriptthree-bhd-slanted-167][encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Heavy-Slanted] [\typescriptthree-bhh-slanted-167][encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Light-Slanted] [\typescriptthree-bhl-slanted-167][encoding=\typescriptthree] - \definefontsynonym[Bauhaus-Medium-Slanted][\typescriptthree-bhm-slanted-167][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-itc-bauhaus.map] -\stoptypescript - -% ef swift -% -% texfont --enc=texnansi --ven=ef --col=swift type-buy.dat - -\starttypescript [serif] [swift] [name] - \definefontsynonym [Serif] [SwiftEF-Regular] - \definefontsynonym [SerifItalic] [SwiftEF-RegularItalic] - \definefontsynonym [SerifSlanted] [SwiftEF-RegularItalic] - \definefontsynonym [SerifBold] [SwiftEF-Bold] - \definefontsynonym [SerifBoldItalic] [SwiftEF-Bold] - \definefontsynonym [SerifBoldSlanted] [SwiftEF-Bold] - \definefontsynonym [SerifCaps] [SwiftSCEF-Regular] -\stoptypescript - -\starttypescript [serif] [swift-light] [name] - \definefontsynonym [Serif] [SwiftEF-Light] - \definefontsynonym [SerifItalic] [SwiftEF-LightItalic] - \definefontsynonym [SerifSlanted] [SwiftEF-LightItalic] - \definefontsynonym [SerifBold] [SwiftEF-Regular] - \definefontsynonym [SerifBoldItalic] [SwiftEF-RegularItalic] - \definefontsynonym [SerifBoldSlanted] [SwiftEF-RegularItalic] - \definefontsynonym [SerifCaps] [SwiftSCEF-Regular] -\stoptypescript - -\starttypescript [serif] [swift] [ec,texnansi] - \definefontsynonym[SwiftEF-Light] [\typescriptthree-swlt] [encoding=\typescriptthree] - \definefontsynonym[SwiftEF-Regular] [\typescriptthree-swrg] [encoding=\typescriptthree] - \definefontsynonym[SwiftEF-Bold] [\typescriptthree-swbd] [encoding=\typescriptthree] - \definefontsynonym[SwiftEF-ExtraBold] [\typescriptthree-swxb] [encoding=\typescriptthree] - \definefontsynonym[SwiftEF-LightItalic] [\typescriptthree-swlti][encoding=\typescriptthree] - \definefontsynonym[SwiftEF-RegularItalic][\typescriptthree-swrgi][encoding=\typescriptthree] - \definefontsynonym[SwiftEF-BoldCondensed][\typescriptthree-swbdc][encoding=\typescriptthree] - \definefontsynonym[SwiftSCEF-Regular] [\typescriptthree-swrgs][encoding=\typescriptthree] - \loadmapfile[\typescriptthree-ef-swift.map] -\stoptypescript - -% linotype syntax - -\starttypescript [sans] [syntax] [name] - \definefontsynonym [Sans] [SyntaxLT-Roman] - \definefontsynonym [SansItalic] [SyntaxLT-Italic] - \definefontsynonym [SansSlanted] [SyntaxLT-Italic] - \definefontsynonym [SansBold] [SyntaxLT-Black] - \definefontsynonym [SansBoldItalic] [SyntaxLT-Black] - \definefontsynonym [SansBoldSlanted][SyntaxLT-Black] -\stoptypescript - -\starttypescript [sans] [syntax] [ec,texnansi] - \definefontsynonym [SyntaxLT-Roman] [\typescriptthree-lte50617] [encoding=\typescriptthree] - \definefontsynonym [SyntaxLT-Italic] [\typescriptthree-lte50618] [encoding=\typescriptthree] - \definefontsynonym [SyntaxLT-Bold] [\typescriptthree-lte50619] [encoding=\typescriptthree] - \definefontsynonym [SyntaxLT-Black] [\typescriptthree-lte50620] [encoding=\typescriptthree] - \definefontsynonym [SyntaxLT-UltraBlack] [\typescriptthree-lte50621] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-linotype-syntax.map] -\stoptypescript - -% linotype linoletter - -\starttypescript [serif] [linoletter] [name] - \definefontsynonym [Serif] [LinoLetterLT-Roman] - \definefontsynonym [SerifItalic] [LinoLetterLT-Italic] - \definefontsynonym [SerifSlanted] [LinoLetterLT-Italic] - \definefontsynonym [SerifBold] [LinoLetterLT-Bold] - \definefontsynonym [SerifBoldItalic] [LinoLetterLT-BoldItalic] - \definefontsynonym [SerifBoldSlanted][LinoLetterLT-BoldItalic] -\stoptypescript - -\starttypescript [serif] [linoletter] [ec,texnansi] - \definefontsynonym[LinoLetterLT-Roman] [texnansi-lte51129] [encoding=\typescriptthree] - \definefontsynonym[LinoLetterLT-Italic] [texnansi-lte51130] [encoding=\typescriptthree] - \definefontsynonym[LinoLetterLT-Bold] [texnansi-lte51133] [encoding=\typescriptthree] - \definefontsynonym[LinoLetterLT-BoldItalic] [texnansi-lte51134] [encoding=\typescriptthree] - \definefontsynonym[LinoLetterLT-BlackItalic] [texnansi-lte51136] [encoding=\typescriptthree] - \definefontsynonym[LinoLetter-MediumSC] [texnansi-llmsc] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-linotype-linoletter.map] -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-cbg.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-cbg.mkii deleted file mode 100644 index a45a71d4ed4..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-cbg.mkii +++ /dev/null @@ -1,352 +0,0 @@ -%D \module -%D [ file=type-cbg, -%D version=2004.08.23, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=CB Greek, -%D author={Giuseppe Bilotta, Hans Hagen}, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% legend: -% -% g=greek -% r=regular s=sansserif t=typewriter -% m=medium x=boldextended t=monospaced -% n=normal o=oblique i=italic u=uprightitalic c=smallcaps - -% ruby script to make small zip file: -% -% zipfile = 'cbsmall.zip' -% -% fontfiles = Array.new -% -% fontfiles.push(Dir.glob("fonts/{tfm,vf,afm,type1}/public/cb/{gr,gs,gt}{m,s,t}{n,o,i,u,c}{0800,1000,1200}.{tfm,afm,pfb}")) -% fontfiles.push(Dir.glob("fonts/{map,enc,lig}/{dvips,pdftex,dvipdfm,dvipdfmx}/cb/{cbgreek,cbsmall}.{map,enc,lig}")) -% -% File.delete(zipfile) if FileTest.file?(zipfile) -% system("zip -r -9 cbsmall #{fontfiles.join(' ')}") - -\starttypescriptcollection[cbgreek] - -\starttypescript [serif] [cbgreek] [name] - \definefontsynonym [CBGreek-Regular-Medium-Normal] [grmn1000] - \definefontsynonym [CBGreek-Regular-Medium-Oblique] [grmo1000] - \definefontsynonym [CBGreek-Regular-Medium-Italic] [grmi1000] - \definefontsynonym [CBGreek-Regular-Medium-UprightItalic] [grmu1000] - \definefontsynonym [CBGreek-Regular-Medium-Caps] [grmc1000] - \definefontsynonym [CBGreek-Regular-Medium-Leipzig] [grml1000] - \definefontsynonym [CBGreek-Regular-Medium-Roman] [grmr1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Normal] [grxn1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Oblique] [grxo1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Italic] [grxi1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-UprightItalic] [grxu1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Caps] [grxc1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Leipzig] [grxl1000] - \definefontsynonym [CBGreek-Regular-BoldExtended-Roman] [grxr1000] - \loadmapfile [cbgreek.map] -\stoptypescript - -\starttypescript [sans] [cbgreek] [name] - \definefontsynonym [CBGreek-Sans-Medium-Normal] [gsmn1000] - \definefontsynonym [CBGreek-Sans-Medium-Oblique] [gsmo1000] - \definefontsynonym [CBGreek-Sans-Medium-Italic] [gsmi1000] - \definefontsynonym [CBGreek-Sans-Medium-UprightItalic] [gsmu1000] - \definefontsynonym [CBGreek-Sans-Medium-Caps] [gsmc1000] - \definefontsynonym [CBGreek-Sans-Medium-Leipzig] [gsml1000] - \definefontsynonym [CBGreek-Sans-Medium-Roman] [gsmr1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Normal] [gsxn1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Oblique] [gsxo1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Italic] [gsxi1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-UprightItalic] [gsxu1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Caps] [gsxc1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Leipzig] [gsxl1000] - \definefontsynonym [CBGreek-Sans-BoldExtended-Roman] [gsxr1000] - \loadmapfile [cbgreek.map] -\stoptypescript - -\starttypescript [mono] [cbgreek] [name] - \definefontsynonym [CBGreek-Typewriter-Medium-Normal] [gttn1000] - \definefontsynonym [CBGreek-Typewriter-Medium-Oblique] [gtto1000] - \definefontsynonym [CBGreek-Typewriter-Medium-Italic] [gtti1000] - \definefontsynonym [CBGreek-Typewriter-Medium-UprightItalic] [gttu1000] - \definefontsynonym [CBGreek-Typewriter-Medium-Caps] [gttc1000] - \definefontsynonym [CBGreek-Typewriter-Medium-Leipzig] [gttl1000] - \definefontsynonym [CBGreek-Typewriter-Medium-Roman] [gttr1000] - \loadmapfile [cbgreek.map] -\stoptypescript - -\starttypescript [serif] [cbgreek] [name] - \definefontsynonym [Serif] [CBGreek-Regular-Medium-Normal] - \definefontsynonym [SerifSlanted] [CBGreek-Regular-Medium-Oblique] - \definefontsynonym [SerifItalic] [CBGreek-Regular-Medium-Italic] - \definefontsynonym [SerifCaps] [CBGreek-Regular-Medium-Caps] - \definefontsynonym [SerifBold] [CBGreek-Regular-BoldExtended-Normal] - \definefontsynonym [SerifBoldSlanted] [CBGreek-Regular-BoldExtended-Oblique] - \definefontsynonym [SerifBoldItalic] [CBGreek-Regular-BoldExtended-Italic] - \definefontsynonym [SerifBoldCaps] [CBGreek-Regular-BoldExtended-Caps] - \loadmapfile [cbgreek.map] -\stoptypescript - -\starttypescript [sans] [cbgreek] [name] - \definefontsynonym [Sans] [CBGreek-Sans-Medium-Normal] - \definefontsynonym [SansSlanted] [CBGreek-Sans-Medium-Oblique] - \definefontsynonym [SansItalic] [CBGreek-Sans-Medium-Italic] - \definefontsynonym [SansCaps] [CBGreek-Sans-Medium-Caps] - \definefontsynonym [SansBold] [CBGreek-Sans-BoldExtended-Normal] - \definefontsynonym [SansBoldSlanted] [CBGreek-Sans-BoldExtended-Oblique] - \definefontsynonym [SansBoldItalic] [CBGreek-Sans-BoldExtended-Italic] - \definefontsynonym [SansBoldCaps] [CBGreek-Sans-BoldExtended-Caps] - \loadmapfile [cbgreek.map] -\stoptypescript - -\starttypescript [mono] [cbgreek] [name] - \definefontsynonym [Mono] [CBGreek-Typewriter-Medium-Normal] - \definefontsynonym [MonoSlanted] [CBGreek-Typewriter-Medium-Oblique] - \definefontsynonym [MonoItalic] [CBGreek-Typewriter-Medium-Italic] - \definefontsynonym [MonoCaps] [CBGreek-Typewriter-Medium-Caps] - \loadmapfile [cbgreek.map] -\stoptypescript - -% Please note that we use Bold Extended instead of Bold - -\starttypescript [serif] [cbgreek-all] [size] - - \definebodyfont [4pt,5pt] [rm] - [tf=grmn0500 sa 1,sl=grmo0500 sa 1,it=grmi0500 sa 1, - bf=grxn0500 sa 1,bs=grxo0500 sa 1,bi=grxi0500 sa 1, - sc=grmc0500 sa 1] - - \definebodyfont [6pt] [rm] - [tf=grmn0600,sl=grmo0600,it=grmi0600, - bf=grxn0600,bs=grxo0600,bi=grxi0600, - sc=grmc0600] - - \definebodyfont [7pt] [rm] - [tf=grmn0700,sl=grmo0700,it=grmi0700, - bf=grxn0700,bs=grxo0700,bi=grxi0700, - sc=grmc0700] - - \definebodyfont [8pt] [rm] - [tf=grmn0800,sl=grmo0800,it=grmi0800, - bf=grxn0800,bs=grxo0800,bi=grxi0800, - sc=grmc0800] - - \definebodyfont [9pt] [rm] - [tf=grmn0900,sl=grmo0900,it=grmi0900, - bf=grxn0900,bs=grxo0900,bi=grxi0900, - sc=grmc0900] - - \definebodyfont [10pt] [rm] - [tf=grmn1000,sl=grmo1000,it=grmi1000, - bf=grxn1000,bs=grxo1000,bi=grxi1000, - sc=grmc1000] - - \definebodyfont [11pt] [rm] - [tf=grmn1095,sl=grmo1095,it=grmi1095, - bf=grxn1095,bs=grxo1095,bi=grxi1095, - sc=grmc1095] - - \definebodyfont [12pt] [rm] - [tf=grmn1200,sl=grmo1200,it=grmi1200, - bf=grxn1200,bs=grxo1200,bi=grxi1200, - sc=grmc1200] - - \definebodyfont [14.4pt,17.3pt,20.7pt] [rm] - [tf=grmn1440 sa 1,sl=grmo1440 sa 1,it=grmi1440 sa 1, - bf=grxn1440 sa 1,bs=grxo1440 sa 1,bi=grxi1440 sa 1, - sc=grmc1440 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [sans] [cbgreek-all] [size] - - \definebodyfont [4pt,5pt] [ss] - [tf=gsmn0500 sa 1,sl=gsmo0500 sa 1,it=gsmi0500 sa 1, - bf=gsxn0500 sa 1,bs=gsxo0500 sa 1,bi=gsxi0500 sa 1, - sc=gsmc0500 sa 1] - - \definebodyfont [6pt] [ss] - [tf=gsmn0600,sl=gsmo0600,it=gsmi0600, - bf=gsxn0600,bs=gsxo0600,bi=gsxi0600, - sc=gsmc0600] - - \definebodyfont [7pt] [ss] - [tf=gsmn0700,sl=gsmo0700,it=gsmi0700, - bf=gsxn0700,bs=gsxo0700,bi=gsxi0700, - sc=gsmc0700] - - \definebodyfont [8pt] [ss] - [tf=gsmn0800,sl=gsmo0800,it=gsmi0800, - bf=gsxn0800,bs=gsxo0800,bi=gsxi0800, - sc=gsmc0800] - - \definebodyfont [9pt] [ss] - [tf=gsmn0900,sl=gsmo0900,it=gsmi0900, - bf=gsxn0900,bs=gsxo0900,bi=gsxi0900, - sc=gsmc0900] - - \definebodyfont [10pt] [ss] - [tf=gsmn1000,sl=gsmo1000,it=gsmi1000, - bf=gsxn1000,bs=gsxo1000,bi=gsxi1000, - sc=gsmc1000] - - \definebodyfont [11pt] [ss] - [tf=gsmn1095,sl=gsmo1095,it=gsmi1095, - bf=gsxn1095,bs=gsxo1095,bi=gsxi1095, - sc=gsmc1095] - - \definebodyfont [12pt] [ss] - [tf=gsmn1200,sl=gsmo1200,it=gsmi1200, - bf=gsxn1200,bs=gsxo1200,bi=gsxi1200, - sc=gsmc1200] - - \definebodyfont [14.4pt,17.3pt,20.7pt] [ss] - [tf=gsmn1440 sa 1,sl=gsmo1440 sa 1,it=gsmi1440 sa 1, - bf=gsxn1440 sa 1,bs=gsxo1440 sa 1,bi=gsxi1440 sa 1, - sc=gsmc1440 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [mono] [cbgreek-all] [size] - - \definebodyfont [4pt,5pt] [tt] - [tf=gttn0500 sa 1,sl=gtto0500 sa 1,it=gtti0500 sa 1, - sc=gttc0500 sa 1] - - \definebodyfont [6pt] [tt] - [tf=gttn0600,sl=gtto0600,it=gtti0600, - sc=gttc0600] - - \definebodyfont [7pt] [tt] - [tf=gttn0700,sl=gtto0700,it=gtti0700, - sc=gttc0700] - - \definebodyfont [8pt] [tt] - [tf=gttn0800,sl=gtto0800,it=gtti0800, - sc=gttc0800] - - \definebodyfont [9pt] [tt] - [tf=gttn0900,sl=gtto0900,it=gtti0900, - sc=gttc0900] - - \definebodyfont [10pt] [tt] - [tf=gttn1000,sl=gtto1000,it=gtti1000, - sc=gttc1000] - - \definebodyfont [11pt] [tt] - [tf=gttn1095,sl=gtto1095,it=gtti1095, - sc=gttc1095] - - \definebodyfont [12pt] [tt] - [tf=gttn1200,sl=gtto1200,it=gtti1200, - sc=gttc1200] - - \definebodyfont [14.4pt,17.3pt,20.7pt] [tt] - [tf=gttn1440 sa 1,sl=gtto1440 sa 1,it=gtti1440 sa 1, - sc=gttc1440 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [serif] [cbgreek-medium] [size] - - \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [rm] - [tf=grmn0800 sa 1,sl=grmo0800 sa 1,it=grmi0800 sa 1, - bf=grxn0800 sa 1,bs=grxo0800 sa 1,bi=grxi0800 sa 1, - sc=grmc0800 sa 1] - - \definebodyfont [10pt,11pt] [rm] - [tf=grmn1000 sa 1,sl=grmo1000 sa 1,it=grmi1000 sa 1, - bf=grxn1000 sa 1,bs=grxo1000 sa 1,bi=grxi1000 sa 1, - sc=grmc1000 sa 1] - - \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [rm] - [tf=grmn1200 sa 1,sl=grmo1200 sa 1,it=grmi1200 sa 1, - bf=grxn1200 sa 1,bs=grxo1200 sa 1,bi=grxi1200 sa 1, - sc=grmc1200 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [sans] [cbgreek-medium] [size] - - \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [ss] - [tf=gsmn0800 sa 1,sl=gsmo0800 sa 1,it=gsmi0800 sa 1, - bf=gsxn0800 sa 1,bs=gsxo0800 sa 1,bi=gsxi0800 sa 1, - sc=gsmc0800 sa 1] - - \definebodyfont [10pt,11pt] [ss] - [tf=gsmn1000 sa 1,sl=gsmo1000 sa 1,it=gsmi1000 sa 1, - bf=gsxn1000 sa 1,bs=gsxo1000 sa 1,bi=gsxi1000 sa 1, - sc=gsmc1000 sa 1] - - \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [ss] - [tf=gsmn1200 sa 1,sl=gsmo1200 sa 1,it=gsmi1200 sa 1, - bf=gsxn1200 sa 1,bs=gsxo1200 sa 1,bi=gsxi1200 sa 1, - sc=gsmc1200 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [mono] [cbgreek-medium] [size] - - \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [tt] - [tf=gttn0800 sa 1,sl=gtto0800 sa 1,it=gtti0800 sa 1, - sc=gttc0800 sa 1] - - \definebodyfont [10pt,11pt] [tt] - [tf=gttn1000 sa 1,sl=gtto1000 sa 1,it=gtti1000 sa 1, - sc=gttc1000 sa 1] - - \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [tt] - [tf=gttn1200 sa 1,sl=gtto1200 sa 1,it=gtti1200 sa 1, - sc=gttc1200 sa 1] - - \loadmapfile [cbgreek.map] - -\stoptypescript - -\starttypescript [cbgreek-all] - - \definebodyfontenvironment [cbgreek] [default] [] - - \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-all] - \definetypeface [cbgreek] [ss] [sans] [cbgreek] [cbgreek-all] - \definetypeface [cbgreek] [tt] [mono] [cbgreek] [cbgreek-all] - -\stoptypescript - -\starttypescript [cbgreek-medium] % lowercase, patched HH - - \definebodyfontenvironment [cbgreek] [default] [] - - \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-medium] - \definetypeface [cbgreek] [ss] [sans] [cbgreek] [cbgreek-medium] - \definetypeface [cbgreek] [tt] [mono] [cbgreek] [cbgreek-medium] - -\stoptypescript - -\starttypescript [cbgreek] % lowercase, patched HH - - \definebodyfontenvironment [cbgreek] [default] [] - - \definetypeface [cbgreek] [rm] [serif] [cbgreek] [default] - \definetypeface [cbgreek] [ss] [sans] [cbgreek] [default] - \definetypeface [cbgreek] [tt] [mono] [cbgreek] [default] - -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-cow.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-cow.mkii deleted file mode 100644 index f46ac968bb6..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-cow.mkii +++ /dev/null @@ -1,85 +0,0 @@ -%D \module -%D [ file=type-cow, -%D version=2006.06.23, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Cow Fonts, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D The cow fonts are a project of Duane Bibby, Hans Hagen and Taco -%D Hoekwater. - -\starttypescriptcollection[cow] - -\starttypescript [math,serif] [cow,sheep] [default] - \setups[font:fallback:serif] - \usemathcollection[cow] - \loadmapfile[koeieletters.map] - \definefontsynonym [Serif] [Cows] [encoding=\typescriptthree] - \definefontsynonym [SerifContour] [CowsContour] [encoding=\typescriptthree] - \definefontsynonym [SerifLogo] [CowsLogo] [encoding=\typescriptthree] - \definefontsynonym [SerifLogoContour][CowsLogoContour] [encoding=\typescriptthree] - \definefontsynonym [MathRoman] [CowsMathRoman] [encoding=\typescriptthree] - \definefontsynonym [MathItalic] [CowsMathItalic] [encoding=\typescriptthree] - \definefontsynonym [MathSymbol] [CowsMathSymbol] [encoding=\typescriptthree] - \definefontsynonym [MathExtension] [CowsMathExtensions][encoding=\typescriptthree] -\stoptypescript - -\starttypescript [math,serif] [sheep] [default] - \setups[font:fallback:serif] - \usemathcollection[cow] - \loadmapfile[koeieletters.map] - \definefontsynonym [Serif] [Sheep] [encoding=\typescriptthree] - \definefontsynonym [SerifContour] [SheepContour] [encoding=\typescriptthree] - \definefontsynonym [SerifLogo] [SheepLogo] [encoding=\typescriptthree] - \definefontsynonym [SerifLogoContour][SheepLogoContour] [encoding=\typescriptthree] - \definefontsynonym [MathRoman] [SheepMathRoman] [encoding=\typescriptthree] - \definefontsynonym [MathItalic] [SheepMathItalic] [encoding=\typescriptthree] - \definefontsynonym [MathSymbol] [SheepMathSymbol] [encoding=\typescriptthree] - \definefontsynonym [MathExtension] [SheepMathExtensions][encoding=\typescriptthree] -\stoptypescript - -\starttypescript [all] [cow,sheep] [default] - \definefontsynonym [Cows] [koeielett] - \definefontsynonym [CowsContour] [koeielett-contour] - \definefontsynonym [CowsLogo] [koeielogos] - \definefontsynonym [CowsLogoContour] [koeielogos-contour] - \definefontsynonym [CowsMathRoman] [koeielett] - \definefontsynonym [CowsMathItalic] [koeieletter-mi] - \definefontsynonym [CowsMathSymbol] [koeieletter-sy] - \definefontsynonym [CowsMathExtensions][koeieletter-ex] -\stoptypescript - -\starttypescript [all] [sheep] [default] - \definefontsynonym [Sheep] [koeielett] - \definefontsynonym [SheepContour] [koeielett-contour] - \definefontsynonym [SheepLogo] [koeielogos] - \definefontsynonym [SheepLogoContour] [koeielogos-contour] - \definefontsynonym [SheepMathRoman] [koeielettx] - \definefontsynonym [SheepMathItalic] [koeieletter-mi] - \definefontsynonym [SheepMathSymbol] [koeieletter-syx] - \definefontsynonym [SheepMathExtensions][koeieletter-ex] -\stoptypescript - -\starttypescript [cow] [default] - \definetypeface [cow] [rm][serif][cow] [default][encoding=default] - \definetypeface [cow] [ss][serif][cow] [default][encoding=default] - \definetypeface [cow] [mm][math] [cow] [default][encoding=default] - \definetypeface [cow] [tt][mono] [modern][default][encoding=default,rscale=0.85] -\stoptypescript - -\starttypescript [sheep] [default] - \definetypeface [sheep][rm][serif][sheep] [default][encoding=default] - \definetypeface [sheep][ss][serif][sheep] [default][encoding=default] - \definetypeface [sheep][mm][math] [sheep] [default][encoding=default] - \definetypeface [sheep][tt][mono] [modern][default][encoding=default,rscale=0.85] -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-exp.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-exp.mkii deleted file mode 100644 index c7c6e4b45d3..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-exp.mkii +++ /dev/null @@ -1,95 +0,0 @@ -%D \module -%D [ file=type-exp, -%D version=2007.01.28, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Experimental Definitions, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% \usetypescript[palatino-light] [texnansi] \setupbodyfont[palatino-light] \input zapf \par -% \usetypescript[palatino-normal][texnansi] \setupbodyfont[palatino-normal] \input zapf \par -% \usetypescript[palatino-medium][texnansi] \setupbodyfont[palatino-medium] \input zapf \par - -%D This file is used for \LUATEX\ experiments. - -\starttypescriptcollection[experiment] - -\starttypescript [sans] [palatino-sans-light] [name] - - \definefontsynonym [Sans] [PalatinoSans-Light] - \definefontsynonym [SansItalic] [PalatinoSans-LightItalic] - \definefontsynonym [SansBold] [PalatinoSans-Regular] - \definefontsynonym [SansBoldItalic] [PalatinoSans-Italic] - \definefontsynonym [SansSlanted] [PalatinoSans-Regular] - \definefontsynonym [SansBoldSlanted] [PalatinoSans-Italic] - \definefontsynonym [SansCaps] [PalatinoSans-Light] - -\stoptypescript - -\starttypescript [sans] [palatino-sans-normal] [name] - - \definefontsynonym [Sans] [PalatinoSans-Regular] - \definefontsynonym [SansItalic] [PalatinoSans-Italic] - \definefontsynonym [SansBold] [PalatinoSans-Bold] - \definefontsynonym [SansBoldItalic] [PalatinoSans-BoldItalic] - \definefontsynonym [SansSlanted] [PalatinoSans-Italic] - \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic] - \definefontsynonym [SansCaps] [PalatinoSans-Regular] - -\stoptypescript - -\starttypescript [sans] [palatino-sans-medium] [name] - - \definefontsynonym [Sans] [PalatinoSans-Medium] - \definefontsynonym [SansItalic] [PalatinoSans-MediumItalic] - \definefontsynonym [SansBold] [PalatinoSans-Bold] - \definefontsynonym [SansBoldItalic] [PalatinoSans-BoldItalic] - \definefontsynonym [SansSlanted] [PalatinoSans-Bold] - \definefontsynonym [SansBoldSlanted] [PalatinoSans-BoldItalic] - \definefontsynonym [SansCaps] [PalatinoSans-MediumSC] - -\stoptypescript - -\starttypescript [sans] [palatino-sans-light,palatino-sans-normal,palatino-sans-medium] [texnansi,ec,8r] - - \definefontsynonym[PalatinoSans-Light] [\typescriptthree-palatinosanscom-light] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-LightItalic] [\typescriptthree-palatinosanscom-lightitalic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-Regular] [\typescriptthree-palatinosanscom-regular] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-Italic] [\typescriptthree-palatinosanscom-italic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-Medium] [\typescriptthree-palatinosanscom-medium] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-MediumItalic][\typescriptthree-palatinosanscom-mediumitalic][encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-Bold] [\typescriptthree-palatinosanscom-bold] [encoding=\typescriptthree] - \definefontsynonym[PalatinoSans-BoldItalic] [\typescriptthree-palatinosanscom-bolditalic] [encoding=\typescriptthree] - -\stoptypescript - -\starttypescript[palatino-normal][texnansi,ec] - \definetypeface[palatino-normal][ss][sans] [palatino-sans-normal] [default][encoding=\typescripttwo] - \definetypeface[palatino-normal][rm][serif][palatino-nova] [default][encoding=\typescripttwo] - \definetypeface[palatino-normal][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[palatino-normal][mm][math] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \quittypescriptscanning -\stoptypescript - -\starttypescript[palatino-medium][texnansi,ec] - \definetypeface[palatino-medium][ss][sans] [palatino-sans-medium] [default][encoding=\typescripttwo] - \definetypeface[palatino-medium][rm][serif][palatino-nova] [default][encoding=\typescripttwo] - \definetypeface[palatino-medium][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[palatino-medium][mm][math] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \quittypescriptscanning -\stoptypescript - -\starttypescript[palatino-light][texnansi,ec] - \definetypeface[palatino-light][ss][sans] [palatino-sans-light] [default][encoding=\typescripttwo] - \definetypeface[palatino-light][rm][serif][palatino-nova] [default][encoding=\typescripttwo] - \definetypeface[palatino-light][tt][mono] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[palatino-light][mm][math] [latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \quittypescriptscanning -\stoptypescript - -\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-fsf.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-fsf.mkii deleted file mode 100644 index 6782d3dcf76..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-fsf.mkii +++ /dev/null @@ -1,94 +0,0 @@ -%D \module -%D [ file=page-new, -%D version=2000.10.20, -%D title=\CONTEXT\ Page Macros, -%D subtitle=Fontsite 500, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D I'm not sure how correct the fontsite cd is. These are probably -%D mostly rip-offs. I no longer use these fonts. - -% run texfont from currentpath with the fonts on subpath fontsite/500 - -% texfont --en=texnansi --ve=fontsite --co=opus type-fsf.dat -% texfont --en=texnansi --ve=fontsite --co=typewriter type-fsf.dat - -\starttypescriptcollection[font site 500] - -%D Please use the original Optima! - -\starttypescript [sans] [opus] [name] - \definefontsynonym [Sans] [Opus] - \definefontsynonym [SansCaps] [OpusSmCaps] - \definefontsynonym [SansItalic] [Opus-Italic] - \definefontsynonym [SansBold] [Opus-Bold] - \definefontsynonym [SansBoldCaps] [OpusSmCaps-Bold] - \definefontsynonym [SansBoldItalic] [Opus-BoldItalic] - \definefontsynonym [SansSlanted] [Opus-Slanted] % faked - \definefontsynonym [SansBoldSlanted] [Opus-BoldSlanted] % faked -\stoptypescript - -\starttypescript [sans] [opus] [texnansi,ec,8r] - \definefontsynonym [Opus] [\typescriptthree-opusrg] [encoding=\typescriptthree] - \definefontsynonym [OpusSmCaps] [\typescriptthree-opusscrg] [encoding=\typescriptthree] - \definefontsynonym [Opus-Italic] [\typescriptthree-opusi] [encoding=\typescriptthree] - \definefontsynonym [Opus-Bold] [\typescriptthree-opusb] [encoding=\typescriptthree] - \definefontsynonym [Opus-BoldItalic] [\typescriptthree-opusbi] [encoding=\typescriptthree] - \definefontsynonym [OpusSmCaps-Bold] [\typescriptthree-opusscb] [encoding=\typescriptthree] - \definefontsynonym [Opus-Slanted] [\typescriptthree-opusrg-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [Opus-BoldSlanted] [\typescriptthree-opusb-slanted-167] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-fontsite-opus.map] -\stoptypescript - -\starttypescript [mono] [typewriter] [name] - \definefontsynonym [Mono] [Typewriter] - \definefontsynonym [MonoItalic] [Typewriter-Italic] - \definefontsynonym [MonoBold] [Typewriter-Bold] - \definefontsynonym [MonoBoldItalic] [Typewriter-BoldItalic] - \definefontsynonym [MonoSlanted] [Typewriter-Slanted] % faked - \definefontsynonym [MonoBoldSlanted] [Typewriter-BoldSlanted] % faked -\stoptypescript - -\starttypescript [mono] [typewriter] [texnansi,ec,8r] - \definefontsynonym [Typewriter] [\typescriptthree-typerg] [encoding=\typescriptthree] - \definefontsynonym [Typewriter-Italic] [\typescriptthree-typei] [encoding=\typescriptthree] - \definefontsynonym [Typewriter-Bold] [\typescriptthree-typeb] [encoding=\typescriptthree] - \definefontsynonym [Typewriter-BoldItalic] [\typescriptthree-typebi] [encoding=\typescriptthree] - \definefontsynonym [Typewriter-Slanted] [\typescriptthree-typerg-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [Typewriter-BoldSlanted] [\typescriptthree-typeb-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [TypewriterCond] [\typescriptthree-typecrg] - \definefontsynonym [TypewriterCond-Bold] [\typescriptthree-typecb] - \loadmapfile[\typescriptthree-fontsite-typewriter.map] -\stoptypescript - -\starttypescript [serif] [garamond] [name] - \definefontsynonym [Serif] [FSGaramond] - \definefontsynonym [SerifCaps] [FSGaramondSmCaps] - \definefontsynonym [SerifItalic] [FSGaramond-Italic] - \definefontsynonym [SerifBold] [FSGaramond-Bold] - \definefontsynonym [SerifBoldCaps] [FSGaramondSmCaps-Bold] - \definefontsynonym [SerifSlanted] [FSGaramond-Slanted] - \definefontsynonym [SerifBoldSlanted] [FSGaramond-BoldSlanted] -\stoptypescript - -\starttypescript [serif] [garamond] [texnansi,ec,8r] - \definefontsynonym [FSGaramond] [\typescriptthree-garamond] [encoding=\typescriptthree] - \definefontsynonym [FSGaramondSmCaps] [\typescriptthree-garasc] [encoding=\typescriptthree] - \definefontsynonym [FSGaramond-Italic] [\typescriptthree-garai] [encoding=\typescriptthree] - \definefontsynonym [FSGaramond-Bold] [\typescriptthree-garab] [encoding=\typescriptthree] - \definefontsynonym [FSGaramond-BoldItalic] [\typescriptthree-garabi] [encoding=\typescriptthree] - \definefontsynonym [FSGaramondSmCaps-Bold] [\typescriptthree-garascb] [encoding=\typescriptthree] - \definefontsynonym [FSGaramond-Slanted] [\typescriptthree-garamond-slanted-167] [encoding=\typescriptthree] - \definefontsynonym [FSGaramond-BoldSlanted] [\typescriptthree-garab-slanted-167] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-fontsite-garamond.map] -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-ghz.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-ghz.mkii deleted file mode 100644 index 3778cd96485..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-ghz.mkii +++ /dev/null @@ -1,409 +0,0 @@ -%D \module -%D [ file=type-ghz, -%D version=2005.06.07, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Hermann Zapf's Fonts, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% \usetypescriptfile[type-ghz] -% -% \definetypeface[optima] [ss][sans] [optima-nova] [default] -% \definetypeface[palatino][rm][serif][palatino-nova][default] -% \definetypeface[aldus] [rm][serif][aldus-nova] [default] -% -% \starttext -% \setupbodyfont[optima] \input zapf \blank -% \setupbodyfont[palatino] \input zapf \blank -% \setupbodyfont[aldus] \input zapf \blank -% \stoptext - -\starttypescriptcollection[zapf collection] - -% zapfino - -\starttypescript [serif,handwriting] [zapfino] [texnansi,ec,8r] % todo: handwriting - - \definefontsynonym [ZapfinoOne] [\typescriptthree-lt54223] [encoding=\typescriptthree] - \definefontsynonym [ZapfinoTwo] [\typescriptthree-lt54224] [encoding=\typescriptthree] - \definefontsynonym [ZapfinoThree] [\typescriptthree-lt54225] [encoding=\typescriptthree] - \definefontsynonym [ZapfinoFour] [\typescriptthree-lt54226] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-zapfino.map] - -\stoptypescript - -% \starttypescript [handwriting] [zapfino-1] \definefontsynonym [Handwriting] [ZapfinoOne] \stoptypescript -% \starttypescript [handwriting] [zapfino-2] \definefontsynonym [Handwriting] [ZapfinoTwo] \stoptypescript -% \starttypescript [handwriting] [zapfino-3] \definefontsynonym [Handwriting] [ZapfinoThree] \stoptypescript -% \starttypescript [handwriting] [zapfino-4] \definefontsynonym [Handwriting] [ZapfinoFour] \stoptypescript - -% optima - -\starttypescript [sans] [optima] [name] - - \definefontsynonym [Sans] [OptimaLT] - \definefontsynonym [SansItalic] [OptimaLT-Italic] - \definefontsynonym [SansBold] [OptimaLT-Bold] - \definefontsynonym [SansBoldItalic] [OptimaLT-BoldItalic] - \definefontsynonym [SansSlanted] [SansItalic] - \definefontsynonym [SansBoldSlanted] [SansBoldItalic] - \definefontsynonym [SansCaps] [Sans] - -\stoptypescript - -\starttypescript [sans] [optima,optima-nova] [texnansi,ec,8r] - - \definefontsynonym [OptimaLT] [\typescriptthree-lte50019] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-Italic] [\typescriptthree-lte52401] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-Bold] [\typescriptthree-lte50021] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-BoldItalic] [\typescriptthree-lte54379] [encoding=\typescriptthree] - - \definefontsynonym [OptimaLT-Medium] [\typescriptthree-lte53505] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-MediumItalic] [\typescriptthree-lte53506] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-DemiBold] [\typescriptthree-lte53507] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-DemiBoldItalic] [\typescriptthree-lte53508] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-Black] [\typescriptthree-lte53509] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-BlackItalic] [\typescriptthree-lte53510] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-ExtraBlack] [\typescriptthree-lte53511] [encoding=\typescriptthree] - \definefontsynonym [OptimaLT-ExtraBlackItalic] [\typescriptthree-lte53512] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-optima.map] - -\stoptypescript - -\starttypescript [optima] [texnansi,ec,qx] - \definetypeface[optima][ss][sans] [optima-nova][default][encoding=\typescripttwo] - \definetypeface[optima][rm][serif][palatino] [default][encoding=\typescripttwo] - \definetypeface[optima][tt][mono] [modern] [default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[optima][mm][math] [palatino] [default][encoding=\typescripttwo] - \quittypescriptscanning -\stoptypescript - -% optima nova - -% see antykwa, we could define variants for light and osf - -\starttypescript [sans] [optima-nova] [name] - - \definefontsynonym [Sans] [OptimaNovaLT-Regular] - \definefontsynonym [SansItalic] [OptimaNovaLT-Italic] - \definefontsynonym [SansBold] [OptimaNovaLT-Bold] - \definefontsynonym [SansBoldItalic] [OptimaNovaLT-BoldItalic] - \definefontsynonym [SansSlanted] [OptimaNovaLT-Italic] - \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-BoldItalic] - \definefontsynonym [SansCaps] [OptimaNovaLT-RegularSC] - - \definefontvariant [Serif][osf][OsF] - \definefontvariant [Serif][sc][Caps] - - \definefontsynonym [SansOsF] [OptimaNovaLT-RegularOsF] - \definefontsynonym [SansItalicOsF] [OptimaNovaLT-ItalicOsF] - \definefontsynonym [SansBoldOsF] [OptimaNovaLT-BoldOsF] - \definefontsynonym [SansBoldItalicOsF] [OptimaNovaLT-BoldItalicOsF] - \definefontsynonym [SansSlantedOsF] [OptimaNovaLT-ItalicOsF] - \definefontsynonym [SansBoldSlantedOsF] [OptimaNovaLT-BoldItalicOsF] - \definefontsynonym [SansCapsOsF] [OptimaNovaLT-RegularSC] - - \definefontsynonym [SansCaps] [OptimaNovaLT-RegularSC] - \definefontsynonym [SansItalicCaps] [OptimaNovaLT-ItalicSC ] - \definefontsynonym [SansBoldCaps] [OptimaNovaLT-BoldSC] - \definefontsynonym [SansBoldItalicCaps] [OptimaNovaLT-BoldItalicSC] - \definefontsynonym [SansSlantedCaps] [OptimaNovaLT-ItalicSC] - \definefontsynonym [SansBoldSlantedCaps] [OptimaNovaLT-BoldItalicSC] - \definefontsynonym [SansCapsCaps] [OptimaNovaLT-RegularSC] - -\stoptypescript - -\starttypescript [sans] [optima-nova-os] [name] - - \definefontsynonym [Sans] [OptimaNovaLT-RegularOsF] - \definefontsynonym [SansItalic] [OptimaNovaLT-ItalicOsF] - \definefontsynonym [SansBold] [OptimaNovaLT-BoldOsF] - \definefontsynonym [SansBoldItalic] [OptimaNovaLT-BoldItalicOsF] - \definefontsynonym [SansSlanted] [OptimaNovaLT-ItalicOsF] - \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-BoldItalicOsF] - \definefontsynonym [SansCaps] [OptimaNovaLT-RegularSC] - -\stoptypescript - -\starttypescript [sans] [optima-nova-light] [name] % may change - - \definefontsynonym [Sans] [OptimaNovaLT-Light] - \definefontsynonym [SansItalic] [OptimaNovaLT-LightItalic] - \definefontsynonym [SansBold] [OptimaNovaLT-Medium] - \definefontsynonym [SansBoldItalic] [OptimaNovaLT-MediumItalic] - \definefontsynonym [SansSlanted] [OptimaNovaLT-LightItalic] - \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-MediumItalic] - \definefontsynonym [SansCaps] [OptimaNovaLT-LightSC] - -\stoptypescript - -\starttypescript [sans] [optima-nova-medium] [name] % may change - - \definefontsynonym [Sans] [OptimaNovaLT-Medium] - \definefontsynonym [SansItalic] [OptimaNovaLT-MediumItalic] - \definefontsynonym [SansBold] [OptimaNovaLT-Heavy] - \definefontsynonym [SansBoldItalic] [OptimaNovaLT-HeavyItalic] - \definefontsynonym [SansSlanted] [OptimaNovaLT-MediumItalic] - \definefontsynonym [SansBoldSlanted] [OptimaNovaLT-HeavyItalic] - \definefontsynonym [SansCaps] [OptimaNovaLT-MediumSC] - -\stoptypescript - -\starttypescript [sans] [optima-nova,optima-nova-light,optima-nova-medium,optima-nova-os] [texnansi,ec,8r] - - \definefontsynonym[OptimaNovaLT-Light] [\typescriptthree-lt55476][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightSC] [\typescriptthree-lt55477][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightOsF] [\typescriptthree-lt55478][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightItalic] [\typescriptthree-lt55479][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightItalicSC] [\typescriptthree-lt55480][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightItalicOsF] [\typescriptthree-lt55481][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-LightCond] [\typescriptthree-lt55482][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Regular] [\typescriptthree-lt55483][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-RegularSC] [\typescriptthree-lt55484][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-RegularOsF] [\typescriptthree-lt55485][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Italic] [\typescriptthree-lt55486][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-ItalicSC] [\typescriptthree-lt55487][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-ItalicOsF] [\typescriptthree-lt55488][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Condensed] [\typescriptthree-lt55489][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Medium] [\typescriptthree-lt55490][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumSC] [\typescriptthree-lt55491][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumOsF] [\typescriptthree-lt55492][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumItalic] [\typescriptthree-lt55493][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumItalicSC] [\typescriptthree-lt55494][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumItalicOsF][\typescriptthree-lt55495][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-MediumCond] [\typescriptthree-lt55496][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-TitlingInitials][\typescriptthree-lt55497][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Demi] [\typescriptthree-lt55498][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiSC] [\typescriptthree-lt55499][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiOsF] [\typescriptthree-lt55500][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiItalic] [\typescriptthree-lt55501][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiItalicSC] [\typescriptthree-lt55502][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiItalicOsF] [\typescriptthree-lt55503][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-DemiCond] [\typescriptthree-lt55504][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Bold] [\typescriptthree-lt55505][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldSC] [\typescriptthree-lt55506][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldOsF] [\typescriptthree-lt55507][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldItalic] [\typescriptthree-lt55508][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldItalicSC] [\typescriptthree-lt55509][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldItalicOsF] [\typescriptthree-lt55510][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BoldCond] [\typescriptthree-lt55511][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Heavy] [\typescriptthree-lt55512][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-HeavyItalic] [\typescriptthree-lt55513][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-Black] [\typescriptthree-lt55514][encoding=\typescriptthree] - \definefontsynonym[OptimaNovaLT-BlackItalic] [\typescriptthree-lt55515][encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-optima-nova.map] - -\stoptypescript - -\starttypescript[optima-nova][texnansi,ec] % will change to more narrow tt - \definetypeface[optima][ss][sans][optima-nova] [default][encoding=\typescripttwo] - \definetypeface[optima][rm][sans][optima-nova] [default][encoding=\typescripttwo] - \definetypeface[optima][tt][mono][latin-modern][default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[optima][mm][math][latin-modern][default][encoding=\typescripttwo,rscale=1.1] - \quittypescriptscanning -\stoptypescript - -\starttypescript[optima-nova-os][texnansi,ec] % will change to more narrow tt - \definetypeface[optima-os][ss][sans][optima-nova-os] [default][encoding=\typescripttwo] - \definetypeface[optima-os][rm][sans][optima-nova-os] [default][encoding=\typescripttwo] - \definetypeface[optima-os][tt][mono][latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \definetypeface[optima-os][mm][math][latin-modern] [default][encoding=\typescripttwo,rscale=1.1] - \quittypescriptscanning -\stoptypescript - -% palatino - -\starttypescript [serif] [palatino] [name] - - \definefontsynonym [Serif] [PalatinoLT-Roman] - \definefontsynonym [SerifItalic] [PalatinoLT-Italic] - \definefontsynonym [SerifBold] [PalatinoLT-Bold] - \definefontsynonym [SerifBoldItalic] [PalatinoLT-BoldItalic] - \definefontsynonym [SerifSlanted] [SerifItalic] - \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic] - - \definefontsynonym [SerifCaps] [PalatinoSC] - -\stoptypescript - -\starttypescript [serif] [palatino] [texnansi,ec,8r] - - \definefontsynonym[PalatinoLT-Roman] [\typescriptthree-lte50001] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-Italic] [\typescriptthree-lte50002] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-Bold] [\typescriptthree-lte50003] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-BoldItalic] [\typescriptthree-lte50004] [encoding=\typescriptthree] - - \definefontsynonym[PalatinoLT-Light] [\typescriptthree-lte52168] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-LightItalic] [\typescriptthree-lte52169] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-Medium] [\typescriptthree-lte52170] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-MediumItalic] [\typescriptthree-lte52171] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-Black] [\typescriptthree-lte52172] [encoding=\typescriptthree] - \definefontsynonym[PalatinoLT-BlackItalic] [\typescriptthree-lte52173] [encoding=\typescriptthree] - \definefontsynonym[Palatino-BoldItalicOsF] [\typescriptthree-pobio] [encoding=\typescriptthree] - \definefontsynonym[Palatino-BoldOsF] [\typescriptthree-pobos] [encoding=\typescriptthree] - \definefontsynonym[Palatino-ItalicOsF] [\typescriptthree-poios] [encoding=\typescriptthree] - - \definefontsynonym[PalatinoSC] [\typescriptthree-posc] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-palatino.map] - -\stoptypescript - -% palatino nova - -\starttypescript [serif] [palatino-nova] [name] - - \definefontsynonym [Serif] [PalatinoNova-Regular] - \definefontsynonym [SerifItalic] [PalatinoNova-Italic] - \definefontsynonym [SerifBold] [PalatinoNova-Bold] - \definefontsynonym [SerifBoldItalic] [PalatinoNova-BoldItalic] - \definefontsynonym [SerifSlanted] [PalatinoNova-Italic] - \definefontsynonym [SerifBoldSlanted] [PalatinoNova-BoldItalic] - \definefontsynonym [SerifCaps] [PalatinoNova-RegularSC] - - \definefontvariant [Serif][sc][Caps] - - \definefontsynonym [SerifCaps] [PalatinoNova-RegularSC] - \definefontsynonym [SerifItalicCaps] [PalatinoNova-ItalicSC] - \definefontsynonym [SerifBoldCaps] [PalatinoNova-BoldSC] - \definefontsynonym [SerifBoldItalicCaps] [PalatinoNova-BoldItalicSC] - \definefontsynonym [SerifSlantedCaps] [PalatinoNova-ItalicSC] - \definefontsynonym [SerifBoldSlantedCaps] [PalatinoNova-BoldItalicSC] - \definefontsynonym [SerifCapsCaps] [PalatinoNova-RegularSC] - -\stoptypescript - -\starttypescript [serif] [palatino-nova-light] [name] % may change - - \definefontsynonym [Serif] [PalatinoNova-Light] - \definefontsynonym [SerifItalic] [PalatinoNova-LightItalic] - \definefontsynonym [SerifBold] [PalatinoNova-Regular] - \definefontsynonym [SerifBoldItalic] [PalatinoNova-Italic] - \definefontsynonym [SerifSlanted] [PalatinoNova-Regular] - \definefontsynonym [SerifBoldSlanted] [PalatinoNova-Italic] - \definefontsynonym [SerifCaps] [PalatinoNova-LightSC] - -\stoptypescript - -\starttypescript [serif] [palatino-nova-medium] [name] % may change - - \definefontsynonym [Serif] [PalatinoNova-Medium] - \definefontsynonym [SerifItalic] [PalatinoNova-MediumItalic] - \definefontsynonym [SerifBold] [PalatinoNova-Bold] - \definefontsynonym [SerifBoldItalic] [PalatinoNova-BoldItalic] - \definefontsynonym [SerifSlanted] [PalatinoNova-Bold] - \definefontsynonym [SerifBoldSlanted] [PalatinoNova-BoldItalic] - \definefontsynonym [SerifCaps] [PalatinoNova-MediumSC] - -\stoptypescript - -\starttypescript [serif] [palatino-nova,palatino-nova-light,palatino-nova-medium] [texnansi,ec,8r] - - \definefontsynonym[PalatinoNova-Light] [\typescriptthree-PalatinoNova-Light] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-LightItalic] [\typescriptthree-PalatinoNova-LightItalic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Regular] [\typescriptthree-PalatinoNova-Regular] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Italic] [\typescriptthree-PalatinoNova-Italic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Medium] [\typescriptthree-PalatinoNova-Medium] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-MediumItalic][\typescriptthree-PalatinoNova-MediumItalic][encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Bold] [\typescriptthree-PalatinoNova-Bold] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-BoldItalic] [\typescriptthree-PalatinoNova-BoldItalic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Imperial] [\typescriptthree-PalatinoNova-Imperial] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-Titling] [\typescriptthree-PalatinoNova-Titling] [encoding=\typescriptthree] - - \definefontsynonym[PalatinoNova-LightSC] [\typescriptthree-sc-PalatinoNova-Light] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-LightItalicSC] [\typescriptthree-sc-PalatinoNova-LightItalic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-RegularSC] [\typescriptthree-sc-PalatinoNova-Regular] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-ItalicSC] [\typescriptthree-sc-PalatinoNova-Italic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-MediumSC] [\typescriptthree-sc-PalatinoNova-Medium] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-MediumItalicSC][\typescriptthree-sc-PalatinoNova-MediumItalic][encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-BoldSC] [\typescriptthree-sc-PalatinoNova-Bold] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-BoldItalicSC] [\typescriptthree-sc-PalatinoNova-BoldItalic] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-ImperialSC] [\typescriptthree-sc-PalatinoNova-Imperial] [encoding=\typescriptthree] - \definefontsynonym[PalatinoNova-TitlingSC] [\typescriptthree-sc-PalatinoNova-Titling] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-palatino-nova.map] - \loadmapfile[\typescriptthree-sc-linotype-palatino-nova.map] - -\stoptypescript - -% aldusnova - -\starttypescript [serif] [aldus-nova] [name] - - \definefontsynonym [Serif] [AldusNova-Book] - \definefontsynonym [SerifItalic] [AldusNova-BookItalic] - \definefontsynonym [SerifBold] [AldusNova-Bold] - \definefontsynonym [SerifBoldItalic] [AldusNova-BoldItalic] - \definefontsynonym [SerifSlanted] [AldusNova-BookItalic] - \definefontsynonym [SerifBoldSlanted] [AldusNova-BoldItalic] - \definefontsynonym [SerifCaps] [AldusNova-BookSC] - - \definefontvariant [Serif][sc][Caps] - - \definefontsynonym [SerifCaps] [AldusNova-BookSC] - \definefontsynonym [SerifItalicCaps] [AldusNova-BookItalicSC] - \definefontsynonym [SerifBoldCaps] [AldusNova-BoldSC] - \definefontsynonym [SerifBoldItalicCaps] [AldusNova-BoldItalicSC] - \definefontsynonym [SerifSlantedCaps] [AldusNova-BookItalicSC] - \definefontsynonym [SerifBoldSlantedCaps] [AldusNova-BoldItalicSC] - \definefontsynonym [SerifCapsCaps] [AldusNova-BookSC] - -\stoptypescript - -\starttypescript [serif] [aldus-nova] [texnansi,ec,8r] - - \definefontsynonym[AldusNova-Book] [\typescriptthree-AldusNova-Book] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-BookItalic] [\typescriptthree-AldusNova-BookItalic] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-Bold] [\typescriptthree-AldusNova-Bold] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-BoldItalic] [\typescriptthree-AldusNova-BoldItalic] [encoding=\typescriptthree] - - \definefontsynonym[AldusNova-BookSC] [\typescriptthree-sc-AldusNova-Book] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-BookItalicSC] [\typescriptthree-sc-AldusNova-BookItalic] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-BoldSC] [\typescriptthree-sc-AldusNova-Bold] [encoding=\typescriptthree] - \definefontsynonym[AldusNova-BoldItalicSC] [\typescriptthree-sc-AldusNova-BoldItalic] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-aldus-nova.map] - \loadmapfile[\typescriptthree-sc-linotype-aldus-nova.map] - -\stoptypescript - -% melior - -\starttypescript [serif] [melior] [name] - - \definefontsynonym [MeliorLT-Roman] [MeliorLT] - - \definefontsynonym [Serif] [MeliorLT-Roman] - \definefontsynonym [SerifItalic] [MeliorLT-Italic] - \definefontsynonym [SerifBold] [MeliorLT-Bold] - \definefontsynonym [SerifBoldItalic] [MeliorLT-BoldItalic] - - \definefontsynonym [SerifSlanted] [SerifItalic] - \definefontsynonym [SerifBoldSlanted] [SerifBoldItalic] - - \definefontsynonym [SerifCaps] [Serif] - -\stoptypescript - -\starttypescript [serif] [melior] [texnansi,ec,8r] - - \definefontsynonym [MeliorLT] [texnansi-lte50062] [encoding=\typescriptthree] - \definefontsynonym [MeliorLT-Italic] [texnansi-lte50063] [encoding=\typescriptthree] - \definefontsynonym [MeliorLT-Bold] [texnansi-lte50064] [encoding=\typescriptthree] - \definefontsynonym [MeliorLT-BoldItalic] [texnansi-lte50065] [encoding=\typescriptthree] - - \loadmapfile[\typescriptthree-linotype-melior.map] - -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-hgz.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-hgz.mkii deleted file mode 100644 index 4d3e495b065..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-hgz.mkii +++ /dev/null @@ -1 +0,0 @@ -\input type-ghz.mkii \endinput % can be file synonym diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-mac.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-mac.mkii deleted file mode 100644 index e8abf09b99e..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-mac.mkii +++ /dev/null @@ -1,593 +0,0 @@ -%D \module -%D [ file=type-mac, -%D version=2009.03.10, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Mac OS X Definitions, -%D author=Wolfgang Schuster, -%D date=\currentdate, -%D copyright={Wolfgang Schuster}] -%C -%C This module is part of the \CONTEXT\ macro||package. See -%C mreadme.pdf for details. - -\definetypescriptprefix [f:andalemono] [Andale Mono] -\definetypescriptprefix [f:chalkboard] [Chalkboard] -\definetypescriptprefix [f:cochin] [Cochin] -\definetypescriptprefix [f:comicsans] [Comic Sans MS] -\definetypescriptprefix [f:couriernew] [Courier New] -\definetypescriptprefix [f:georgia] [Georgia] -\definetypescriptprefix [f:lucidagrande] [Lucida Grande] -\definetypescriptprefix [f:monaco] [Monaco] -\definetypescriptprefix [f:tahoma] [Tahoma] -\definetypescriptprefix [f:timesnewroman] [Times New Roman] -\definetypescriptprefix [f:trebuchet] [Trebuchet MS] -\definetypescriptprefix [f:verdana] [Verdana] - -\definetypescriptprefix [n:andalemono] [AndaleMono] -\definetypescriptprefix [n:chalkboard] [Chalkboard] -\definetypescriptprefix [n:cochin] [Cochin] -\definetypescriptprefix [n:comicsans] [ComicSans] -\definetypescriptprefix [n:couriernew] [CourierNew] -\definetypescriptprefix [n:georgia] [Georgia] -\definetypescriptprefix [n:lucidagrande] [LucidaGrande] -\definetypescriptprefix [n:monaco] [Monaco] -\definetypescriptprefix [n:tahoma] [Tahoma] -\definetypescriptprefix [n:timesnewroman] [TimesNewRoman] -\definetypescriptprefix [n:trebuchet] [Trebuchet] -\definetypescriptprefix [n:verdana] [Verdana] - -\starttypescriptcollection [macosx] - -% American Typewriter - -\starttypescript [serif] [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter] - \definefontsynonym [AmericanTypewriter-Light] [name:American Typewriter Light] [features=default] - \definefontsynonym [AmericanTypewriter-Regular] [name:American Typewriter] [features=default] - \definefontsynonym [AmericanTypewriter-Bold] [name:American Typewriter Bold] [features=default] - \definefontsynonym [AmericanTypewriter-LightCond] [name:American Typewriter Condensed Light] [features=default] - \definefontsynonym [AmericanTypewriter-Condensed] [name:American Typewriter Condensed] [features=default] - \definefontsynonym [AmericanTypewriter-BoldCond] [name:American Typewriter Condensed Bold] [features=default] -\stoptypescript - -\starttypescript [serif] [americantypewriter-light-condensed] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [AmericanTypewriter-LightCond] [features=default] - \definefontsynonym [SerifBold] [AmericanTypewriter-Condensed] [features=default] -\stoptypescript - -\starttypescript [serif] [americantypewriter-condensed] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [AmericanTypewriter-Condensed] [features=default] - \definefontsynonym [SerifBold] [AmericanTypewriter-BoldCond] [features=default] -\stoptypescript - -\starttypescript [serif] [americantypewriter-light] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [AmericanTypewriter-Light] [features=default] - \definefontsynonym [SerifBold] [AmericanTypewriter-Regular] [features=default] -\stoptypescript - -\starttypescript [serif] [americantypewriter] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [AmericanTypewriter-Regular] [features=default] - \definefontsynonym [SerifBold] [AmericanTypewriter-Bold] [features=default] -\stoptypescript - -\starttypescript [americantypewriter-light-condensed,americantypewriter-condensed,americantypewriter-light,americantypewriter] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Arial / Arial Narrow / Arial Rounded / Arial Unicode - -\starttypescript [sans] [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode] - \definefontsynonym [Arial-Condensed] [name:Arial Narrow] [features=default] - \definefontsynonym [Arial-ItalicCond] [name:Arial Narrow Italic] [features=default] - \definefontsynonym [Arial-BoldCond] [name:Arial Narrow Bold] [features=default] - \definefontsynonym [Arial-BoldItalicCond] [name:Arial Narrow Bold Italic] [features=default] - \definefontsynonym [Arial-Regular] [name:Arial] [features=default] - \definefontsynonym [Arial-Italic] [name:Arial Italic] [features=default] - \definefontsynonym [Arial-Bold] [name:Arial Bold] [features=default] - \definefontsynonym [Arial-BoldItalic] [name:Arial Bold Italic] [features=default] - \definefontsynonym [Arial-Black] [name:Arial Black] [features=default] - \definefontsynonym [Arial-Unicode] [name:Arial Unicode MS] [features=default] - \definefontsynonym [Arial-Rounded] [name:Arial Rounded MT Bold] [features=default] -\stoptypescript - -\starttypescript [sans] [arial-narrow,arial-condensed] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Arial-Condensed] [features=default] - \definefontsynonym [SansItalic] [Arial-ItalicCond] [features=default] - \definefontsynonym [SansBold] [Arial-BoldCond] [features=default] - \definefontsynonym [SansBoldItalic] [Arial-BoldItalicCond] [features=default] -\stoptypescript - -\starttypescript [sans] [arial] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Arial-Regular] [features=default] - \definefontsynonym [SansItalic] [Arial-Italic] [features=default] - \definefontsynonym [SansBold] [Arial-Bold] [features=default] - \definefontsynonym [SansBoldItalic] [Arial-BoldItalic] [features=default] -\stoptypescript - -\starttypescript [sans] [arial-rounded] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Arial-Rounded] [features=default] -\stoptypescript - -\starttypescript [sans] [arial-unicode] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Arial-Unicode] [features=default] -\stoptypescript - -\starttypescript [arial-narrow,arial-condensed,arial,arial-rounded,arial-unicode] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Baskerville - -\starttypescript [serif] [baskerville] - \definefontsynonym [Baskerville-Regular] [name:Baskerville] [features=default] - \definefontsynonym [Baskerville-Italic] [name:Baskerville Italic] [features=default] - \definefontsynonym [Baskerville-Medium] [name:Baskerville SemiBold] [features=default] - \definefontsynonym [Baskerville-MediumItalic] [name:Baskerville SemiBold Italic] [features=default] - \definefontsynonym [Baskerville-Bold] [name:Baskerville Bold] [features=default] - \definefontsynonym [Baskerville-BoldItalic] [name:Baskerville Bold Italic] [features=default] -\stoptypescript - -\starttypescript [serif] [baskerville] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [Baskerville-Regular] [features=default] - \definefontsynonym [SerifItalic] [Baskerville-Italic] [features=default] - \definefontsynonym [SerifBold] [Baskerville-Medium] [features=default] - \definefontsynonym [SerifBoldItalic] [Baskerville-MediumItalic] [features=default] -\stoptypescript - -\starttypescript [baskerville] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Big Caslon - -\starttypescript [serif] [caslon,bigcaslon] - \definefontsynonym [BigCaslon-Medium] [name:Big Caslon Medium] [features=default] -\stoptypescript - -\starttypescript [serif] [caslon,bigcaslon] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [BigCaslon-Medium] [features=default] -\stoptypescript - -\starttypescript [caslon,bigcaslon] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Copperplate - -\starttypescript [sans] [copperplate-light,copperplate] - \definefontsynonym [Copperplate-Light] [name:Copperplate Light] [features=default] - \definefontsynonym [Copperplate-Regular] [name:Copperplate] [features=default] - \definefontsynonym [Copperplate-Bold] [name:Copperplate Bold] [features=default] -\stoptypescript - -\starttypescript [sans] [copperplate-light] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Copperplate-Light] [features=default] - \definefontsynonym [SansBold] [Copperplate-Regular] [features=default] -\stoptypescript - -\starttypescript [sans] [copperplate] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Copperplate-Regular] [features=default] - \definefontsynonym [SansBold] [Copperplate-Bold] [features=default] -\stoptypescript - -\starttypescript [copperplate-light,copperplate] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Futura - -\starttypescript [sans] [futura-condensed,futura] - \definefontsynonym [Futura-MediumCond] [name:Futura Condensed Medium] [features=default] - \definefontsynonym [Futura-Medium] [name:Futura Medium] [features=default] - \definefontsynonym [Futura-MediumItalic] [name:Futura Medium Italic] [features=default] - \definefontsynonym [Futura-BoldCond] [name:Futura Condensed ExtraBold] [features=default] -\stoptypescript - -\starttypescript [sans] [futura-condensed] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Futura-MediumCond] [features=default] - \definefontsynonym [SansBold] [Futura-BoldCond] [features=default] -\stoptypescript - -\starttypescript [sans] [futura] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Futura-Medium] [features=default] - \definefontsynonym [SansItalic] [Futura-MediumItalic] [features=default] -\stoptypescript - -\starttypescript [futura-condensed,futura] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Gill Sans - -\starttypescript [sans] [gillsans-light,gillsans] - \definefontsynonym [GillSans-Light] [name:Gill Sans Light] [features=default] - \definefontsynonym [GillSans-LightItalic] [name:Gill Sans Light Italic] [features=default] - \definefontsynonym [GillSans-Regular] [name:Gill Sans] [features=default] - \definefontsynonym [GillSans-Italic] [name:Gill Sans Italic] [features=default] - \definefontsynonym [GillSans-Bold] [name:Gill Sans Bold] [features=default] - \definefontsynonym [GillSans-BoldItalic] [name:Gill Sans Bold Italic] [features=default] -\stoptypescript - -\starttypescript [sans] [gillsans-light] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [GillSans-Light] [features=default] - \definefontsynonym [SansItalic] [GillSans-LightItalic] [features=default] - \definefontsynonym [SansBold] [GillSans-Regular] [features=default] - \definefontsynonym [SansBoldItalic] [GillSans-Italic] [features=default] -\stoptypescript - -\starttypescript [sans] [gillsans] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [GillSans-Regular] [features=default] - \definefontsynonym [SansItalic] [GillSans-Italic] [features=default] - \definefontsynonym [SansBold] [GillSans-Bold] [features=default] - \definefontsynonym [SansBoldItalic] [GillSans-BoldItalic] [features=default] -\stoptypescript - -\starttypescript [gillsans-light,gillsans] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Helvetica Neuse - -\starttypescript [sans] [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed] - \definefontsynonym [HelveticaNeue-UltraLight] [name:Helvetica Neue UltraLight] [features=default] - \definefontsynonym [HelveticaNeue-UltraLightItalic] [name:Helvetica Neue UltraLight Italic] [features=default] - \definefontsynonym [HelveticaNeue-Light] [name:Helvetica Neue Light] [features=default] - \definefontsynonym [HelveticaNeue-LightItalic] [name:Helvetica Neue Light Italic] [features=default] - \definefontsynonym [HelveticaNeue-Regular] [name:Helvetica Neue] [features=default] - \definefontsynonym [HelveticaNeue-Italic] [name:Helvetica Neue Italic] [features=default] - \definefontsynonym [HelveticaNeue-Bold] [name:Helvetica Neue Bold] [features=default] - \definefontsynonym [HelveticaNeue-BoldItalic] [name:Helvetica Neue Bold Italic] [features=default] - \definefontsynonym [HelveticaNeue-BoldCond] [name:Helvetica Neue Condensed Bold] [features=default] - \definefontsynonym [HelveticaNeue-BlackCond] [name:Helvetica Neue Condensed Black] [features=default] -\stoptypescript - -\starttypescript [sans] [helvetica-neue-ultralight] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HelveticaNeue-UltraLight] [features=default] - \definefontsynonym [SansItalic] [HelveticaNeue-UltraLightItalic] [features=default] - \definefontsynonym [SansBold] [HelveticaNeue-Light] [features=default] - \definefontsynonym [SansBoldItalic] [HelveticaNeue-LightItalic] [features=default] -\stoptypescript - -\starttypescript [sans] [helvetica-neue-light] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HelveticaNeue-Light] [features=default] - \definefontsynonym [SansItalic] [HelveticaNeue-LightItalic] [features=default] - \definefontsynonym [SansBold] [HelveticaNeue-Regular] [features=default] - \definefontsynonym [SansBoldItalic] [HelveticaNeue-Italic] [features=default] -\stoptypescript - -\starttypescript [sans] [helvetica-neue] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HelveticaNeue-Regular] [features=default] - \definefontsynonym [SansItalic] [HelveticaNeue-Italic] [features=default] - \definefontsynonym [SansBold] [HelveticaNeue-Bold] [features=default] - \definefontsynonym [SansBoldItalic] [HelveticaNeue-BoldItalic] [features=default] -\stoptypescript - -\starttypescript [sans] [helvetica-neue-boldcondensed] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HelveticaNeue-BoldCond] [features=default] - \definefontsynonym [SansBold] [HelveticaNeue-BlackCond] [features=default] -\stoptypescript - -\starttypescript [helvetica-neue-ultralight,helvetica-neue-light,helvetica-neue,helvetica-neue-boldcondensed] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Hiragino Mincho - -\starttypescript [serif] [hiragino-mincho] - \definefontsynonym [HiraginoMinchoPro-Regular] [name:Hiragino Mincho Pro W3] [features=japanese] - \definefontsynonym [HiraginoMinchoPro-Bold] [name:Hiragino Mincho Pro W6] [features=japanese] - \definefontsynonym [HiraginoMinchoProN-Regular] [name:Hiragino Mincho ProN W3] [features=japanese] - \definefontsynonym [HiraginoMinchoProN-Bold] [name:Hiragino Mincho ProN W6] [features=japanese] -\stoptypescript - -\starttypescript [serif] [hiragino-mincho] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [HiraginoMinchoPro-Regular] [features=japanese] - \definefontsynonym [SerifBold] [HiraginoMinchoPro-Bold] [features=japanese] -\stoptypescript - -% \starttypescript [serif] [hiragino-mincho] -% \setups[font:fallback:serif] -% \definefontsynonym [Serif] [HiraginoMinchoProN-Regular] [features=japanese] -% \definefontsynonym [SerifBold] [HiraginoMinchoProN-Bold] [features=japanese] -% \stoptypescript - -\starttypescript [hiragino-mincho] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Hiragino Maru - -\starttypescript [sans] [hiragino-maru] - \definefontsynonym [HiraginoMaruGothicPro-Regular] [name:Hiragino Maru Gothic Pro W4] [features=japanese] - \definefontsynonym [HiraginoMaruGothicProN-Regular] [name:Hiragino Maru Gothic ProN W4] [features=japanese] -\stoptypescript - -\starttypescript [sans] [hiragino-maru] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HiraginoMaruGothicPro-Regular] [features=japanese] -\stoptypescript - -% \starttypescript [sans] [hiragino-maru] -% \setups[font:fallback:sans] -% \definefontsynonym [Sans] [HiraginoMaruGothicProN-Regular] [features=japanese] -% \stoptypescript - -\starttypescript [hiragino-maru] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Hiragino Kaku - -\starttypescript [sans] [hiragino-kaku] - \definefontsynonym [HiraginoKakuGothicPro-Regular] [name:Hiragino Kaku Gothic Pro W3] [features=japanese] - \definefontsynonym [HiraginoKakuGothicPro-Bold] [name:Hiragino Kaku Gothic Pro W6] [features=japanese] - \definefontsynonym [HiraginoKakuGothicStd-Black] [name:Hiragino Kaku Gothic Std W8] [features=japanese] - \definefontsynonym [HiraginoKakuGothicProN-Regular] [name:Hiragino Kaku Gothic Pron W3] [features=japanese] - \definefontsynonym [HiraginoKakuGothicProN-Bold] [name:Hiragino Kaku Gothic ProN W6] [features=japanese] - \definefontsynonym [HiraginoKakuGothicStdN-Black] [name:Hiragino Kaku Gothic StdN W8] [features=japanese] -\stoptypescript - -\starttypescript [sans] [hiragino-kaku] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [HiraginoKakuGothicPro-Regular] [features=japanese] - \definefontsynonym [SansBold] [HiraginoKakuGothicPro-Bold] [features=japanese] -\stoptypescript - -% \starttypescript [sans] [hiragino-kaku] -% \setups[font:fallback:sans] -% \definefontsynonym [Sans] [HiraginoKakuGothicProN-Regular] [features=japanese] -% \definefontsynonym [SansBold] [HiraginoKakuGothicProN-Bold] [features=japanese] -% \stoptypescript - -\starttypescript [hiragino-kaku] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Hoefler Text - -\starttypescript [serif] [hoefler] - \definefontsynonym [HoeflerText-Regular] [name:Hoefler Text] [features=default] - \definefontsynonym [HoeflerText-Italic] [name:Hoefler Text Italic] [features=default] - \definefontsynonym [HoeflerText-Black] [name:Hoefler Text Black] [features=default] - \definefontsynonym [HoeflerText-BlackItalic] [name:Hoefler Text Black Italic] [features=default] - \definefontsynonym [HoeflerText-Ornaments] [name:Hoefler Text Ornaments] [features=default] -\stoptypescript - -\starttypescript [serif] [hoefler] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [HoeflerText-Regular] [features=default] - \definefontsynonym [SerifItalic] [HoeflerText-Italic] [features=default] - \definefontsynonym [SerifBold] [HoeflerText-Black] [features=default] - \definefontsynonym [SerifBoldItalic] [HoeflerText-BlackItalic] [features=default] -\stoptypescript - -\starttypescript [hoefler] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Impact - -\starttypescript [sans] [impact] - \definefontsynonym [Impact-Regular] [name:Impact] [features=default] -\stoptypescript - -\starttypescript [sans] [impact] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Impact-Regular] [features=default] -\stoptypescript - -\starttypescript [impact] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Andale Mono / Monaco - -\starttypescript [mono] [andalemono,monaco] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}] [features=default] -\stoptypescript - -\starttypescript [mono] [andalemono,monaco] - \setups[font:fallback:mono] - \definefontsynonym [Mono] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default] -\stoptypescript - -\starttypescript [andalemono,monaco] - \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default] -\stoptypescript - -% Optima - -\starttypescript [sans] [optima,optima-bold] - \definefontsynonym [Optima-Regular] [name:Optima Regular] [features=default] - \definefontsynonym [Optima-Italic] [name:Optima Italic] [features=default] - \definefontsynonym [Optima-Bold] [name:Optima Bold] [features=default] - \definefontsynonym [Optima-BoldItalic] [name:Optima Bold Italic] [features=default] - \definefontsynonym [Optima-Black] [name:Optima ExtraBlack] [features=default] -\stoptypescript - -\starttypescript [sans] [optima] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Optima-Regular] [features=default] - \definefontsynonym [SansItalic] [Optima-Italic] [features=default] - \definefontsynonym [SansBold] [Optima-Bold] [features=default] - \definefontsynonym [SansBoldItalic] [Optima-BoldItalic] [features=default] -\stoptypescript - -\starttypescript [sans] [optima-bold] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Optima-Bold] [features=default] - \definefontsynonym [SansItalic] [Optima-BoldItalic] [features=default] - \definefontsynonym [SansBold] [Optima-Black] [features=default] -\stoptypescript - -\starttypescript [optima,optima-bold] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Papyrus - -\starttypescript [sans] [papyrus] - \definefontsynonym [Papyrus-Regular] [name:Papyrus] [features=default] - \definefontsynonym [Papyrus-Condensed] [name:Papyrus Condensed] [features=default] -\stoptypescript - -\starttypescript [sans] [papyrus] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Papyrus-Regular] [features=default] -\stoptypescript - -\starttypescript [papyrus] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% STFangsong - -\starttypescript [serif] [stfangsong] - \definefontsynonym [STFangsong-Regular] [name:STFangsong] [features=chinese] -\stoptypescript - -\starttypescript [serif] [stfangsong] - \setups[font:fallback:sans] - \definefontsynonym [Serif] [STFangsong-Regular] [features=chinese] -\stoptypescript - -\starttypescript [stfangsong] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% STHeiti - -\starttypescript [sans] [stheiti] - \definefontsynonym [STXihei-Light] [name:STHeiti Light] [features=chinese] - \definefontsynonym [STHeiti-Regular] [name:STHeiti Regular] [features=chinese] -\stoptypescript - -\starttypescript [sans] [stheiti] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [STXihei-Light] [features=chinese] - \definefontsynonym [SansBold] [STKaiti-Regular] [features=chinese] -\stoptypescript - -\starttypescript [stheiti] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% STKaiti - -\starttypescript [serif] [stkaiti] - \definefontsynonym [STKaiti-Regular] [name:STKaiti] [features=chinese] -\stoptypescript - -\starttypescript [serif] [stkaiti] - \setups[font:fallback:sans] - \definefontsynonym [Serif] [STKaiti-Regular] [features=chinese] -\stoptypescript - -\starttypescript [stkaiti] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% STSong - -\starttypescript [serif] [stsong] - \definefontsynonym [STSong-Regular] [name:STSong] [features=chinese] -\stoptypescript - -\starttypescript [serif] [stsong] - \setups[font:fallback:sans] - \definefontsynonym [Serif] [STSong-Regular] [features=chinese] -\stoptypescript - -\starttypescript [stsong] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Chalkboard / Comic Sans / Tahoma - -\starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}] [features=default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [name:\typescriptprefix{f:\typescripttwo} Bold] [features=default] -\stoptypescript - -\starttypescript [sans] [chalkboard,comicsans,lucidagrande,tahoma] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default] - \definefontsynonym [SansBold] [\typescriptprefix{n:\typescripttwo}-Bold] [features=default] -\stoptypescript - -\starttypescript [chalkboard,comicsans,tahoma] - \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -\stoptypescript - -% Cochin / Courier New / Georgia / Times New Roman / Trebuchet / Verdana - -\starttypescript [serif,sans,mono] [cochin,georgia,timesnewroman,trebuchet,verdana,couriernew] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [name:\typescriptprefix{f:\typescripttwo}] [features=default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic] [name:\typescriptprefix{f:\typescripttwo} Italic] [features=default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [name:\typescriptprefix{f:\typescripttwo} Bold] [features=default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} Bold Italic] [features=default] -\stoptypescript - -\starttypescript [serif] [cochin,georgia,timesnewroman] - \setups[font:fallback:serif] - \definefontsynonym [Serif] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default] - \definefontsynonym [SerifItalic] [\typescriptprefix{n:\typescripttwo}-Italic] [features=default] - \definefontsynonym [SerifBold] [\typescriptprefix{n:\typescripttwo}-Bold] [features=default] - \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default] -\stoptypescript - -\starttypescript [cochin,georgia,timesnewroman] - \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] -\stoptypescript - -% Courier New - -% \starttypescript [mono] [couriernew] -% \setups[font:fallback:mono] -% \definefontsynonym [Mono] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default] -% \definefontsynonym [MonoItalic] [\typescriptprefix{n:\typescripttwo}-Italic] [features=default] -% \definefontsynonym [MonoBold] [\typescriptprefix{n:\typescripttwo}-Bold] [features=default] -% \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default] -% \stoptypescript - -% \starttypescript [couriernew] -% \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default] -% \stoptypescript - -% Trebuchet / Verdana - -% \starttypescript [sans] [trebuchet,verdana] -% \setups[font:fallback:sans] -% \definefontsynonym [Sans] [\typescriptprefix{n:\typescripttwo}-Regular] [features=default] -% \definefontsynonym [SansItalic] [\typescriptprefix{n:\typescripttwo}-Italic] [features=default] -% \definefontsynonym [SansBold] [\typescriptprefix{n:\typescripttwo}-Bold] [features=default] -% \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default] -% \stoptypescript - -% \starttypescript [trebuchet,verdana] -% \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default] -% \stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-msw.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-msw.mkii deleted file mode 100644 index 26ec190cbee..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-msw.mkii +++ /dev/null @@ -1 +0,0 @@ -\input type-win.mkii \endinput % could be a file synonym diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-pre.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-pre.mkii deleted file mode 100644 index 99db52c2fad..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-pre.mkii +++ /dev/null @@ -1,253 +0,0 @@ -%D \module -%D [ file=type-pre, -%D version=2001.04.12, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Compatibility scripts, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This file is obsolete. We now have latin modern and proper -%D typescripts. Forget about this file. - -%D This file defines some typescripts that simulate the pre-typescript way -%D of defining fonts. This file will not be extended. - -\starttypescriptcollection[previous] - -%D The Computer Modern Roman is derived from the Monotype~8a -%D Times Roman. In this module, that is loaded by default, we -%D define all relevant alternatives. - -\starttypescript [cmr] - \usetypescript[modern][default] - \setupbodyfont[modern] -\stoptypescript - -%D This script remaps the default Computer Modern Font Files -%D onto the EC ones, so that hyphenations work well. (The proper -%D latin modern ec variants have replaed the ae ones.) - -\starttypescript [aer] - \usetypescript[modern][ec] - \setupbodyfont[modern] - %\enableregime[ec] -\stoptypescript - -%D This script defines the Computer Modern Roman with a pseudo kind -%D of iso latin 2 encoding. - -\starttypescript [csr] - \usetypescript[modern][ec] - \setupbodyfont[modern] - \enableregime[il2] -\stoptypescript - -%D This script defines the Computer Modern Roman with a -%D polish encoding. - -\starttypescript [plr] - \usetypescript[modern][qx] - \setupbodyfont[modern] - \enableregime[pl0] -\stoptypescript - -%D Vietnamese. - -\starttypescript [vnr] - \usetypescript[modern][t5] - \setupbodyfont[modern] -\stoptypescript - -%D Cyrillic alternatives are available under the symbolic -%D name \type {cyr}. - -\starttypescript [cyr] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,cyr] - \usemathcollection[default] -\stoptypescript - -\starttypescript [lh-ec] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec] - \usemathcollection[default] -\stoptypescript - -\starttypescript [lh-t2a] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2a] - \usemathcollection[default] -\stoptypescript - -\starttypescript [lh-t2b] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2b] - \usemathcollection[default] -\stoptypescript - -\starttypescript [lh-t2c] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t2c] - \usemathcollection [default] -\stoptypescript - -\starttypescript [lh-x2] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,x2] - \usemathcollection [default] -\stoptypescript - -\starttypescript [lh-lcy] - \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,lcy] - \usemathcollection [default] -\stoptypescript - -%D Here we implement the symbol fonts as provided by the -%D American Mathematical Society. The names of these symbols -%D can be found in The Joy of \TeX\ by M.~Spivak. - -% \starttypescript [ams] -% \usetypescript [math] [ams] [all] -% \usemathcollection[default] -% \stoptypescript - -%D The Concrete Modern Roman is just an alternative Computer -%D Modern Roman. - -% \starttypescript [con] -% \usetypescript [serif] [concrete] [all] -% \usemathcollection[default] -% \stoptypescript - -%D The Euler Fonts are designed by Herman Zapf and can be -%D used with the Concrete Fonts defined elsewhere. - -% \starttypescript [eul] -% \usetypescript [math] [euler] [all] -% \usemathcollection[eul] -% \stoptypescript - -%D The Lucida Bright fonts are both good looking and and -%D complete. These fonts have prebuilt accented characters, -%D which means that we use another encoding vector: \YandY\ -%D texnansi. These fonts are a good illustration that a 12 -%D point bodyfont is indeed never that size. The Lucida Bright -%D fonts come in one design size. - -% \starttypescript [lbr] -% \usetypescript [serif,sans,mono,math,calligraphy,handwriting] [lucida] [name,special,\defaultencoding] -% \usetypescript [serif,sans,mono,math,calligraphy,handwriting] [default] [size] -% \usemathcollection[lbr] -% \usetypescript [all] [lucida] [\defaultencoding] -% \stoptypescript - -\starttypescript [lbr] - \usetypescript[lucida][\defaultencoding] -\stoptypescript - -%D Times - -\starttypescript [tim] - \usetypescript [times] [\defaultencoding] - \setupbodyfont [times] -\stoptypescript - -%D The Antikwa Torunska font family is a rather nice -%D and subtle one. Although primary meant for the polish -%D language, it can be used for other languages as well. - -\starttypescript [ant] - \usetypescript [antykwa-torunska] [\defaultencoding] - \setupbodyfont [antykwa,rm] -\stoptypescript - -%D This script defines the Standard Adobe Courier fonts. - -% \starttypescript [pcr] -% \usetypescript [mono] [courier] [name,\defaultencoding] -% \usetypescript [mono] [default] [size] -% \usetypescript [all] [courier] [\defaultencoding] -% \stoptypescript - -\starttypescript [pcr] - \usetypescript [postscript] [\defaultencoding] - \setupbodyfont [postscript,tt] -\stoptypescript - -%D This script defines the Standard Adobe Helvetica fonts. - -% \starttypescript [phv] -% \usetypescript [sans] [helvetica] [name,\defaultencoding] -% \usetypescript [sans] [default] [size] -% \usetypescript [all] [helvetica] [\defaultencoding] -% \stoptypescript - -\starttypescript [phv] - \usetypescript [postscript] [\defaultencoding] - \setupbodyfont [postscript,ss] -\stoptypescript - -%D This script defines the Standard Adobe Times fonts. - -% \starttypescript [ptm] -% \usetypescript [serif] [times] [name,\defaultencoding] -% \usetypescript [serif] [default] [size] -% \usetypescript [all] [times] [\defaultencoding] -% \stoptypescript - -\starttypescript [ptm] - \usetypescript [postscript] [\defaultencoding] - \setupbodyfont [postscript,rm] -\stoptypescript - -%D This script loads the Adobe Times Roman, Helvetica and -%D Courier. - -% \starttypescript [pos] -% \usetypescript [serif] [times] [name,\defaultencoding] -% \usetypescript [sans] [helvetica] [name,\defaultencoding] -% \usetypescript [mono] [courier] [name,\defaultencoding] -% \usetypescript [serif,sans,mono] [default] [size] -% \usetypescript [all] [times,helvetica,courier] [\defaultencoding] -% \stoptypescript - -\starttypescript [pos] - \usetypescript [postscript] [\defaultencoding] - \setupbodyfont [postscript] -\stoptypescript - -%D This script defines the Palatino font. - -\starttypescript [ppl] - \usetypescript [palatino] [\defaultencoding] - \setupbodyfont [palatino] -\stoptypescript - -%D The following scripts fake the old \type {font-ber} and -%D alike files. - -\starttypescript[fil] - % fake to prevent loading font-fil.tex and signal 'done' -\stoptypescript - -%D But for old time sake we provide: - -\starttypescript[ber] - \usetypescript [berry] [ec,t5] % could be [all] -\stoptypescript - -\stoptypescriptcollection - -%D Special scripts: - -\unprotect - -\starttypescriptcollection[special scripts] - - \starttypescript[chi] \readfile{\f!fontprefix chi}\donothing\donothing \stoptypescript - \starttypescript[jap] \readfile{\f!fontprefix jap}\donothing\donothing \stoptypescript - \starttypescript[arb] \readfile{\f!fontprefix arb}\donothing\donothing \stoptypescript - \starttypescript[heb] \readfile{\f!fontprefix heb}\donothing\donothing \stoptypescript - -\stoptypescriptcollection - -\protect \endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-win.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-win.mkii deleted file mode 100644 index ae690982093..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-win.mkii +++ /dev/null @@ -1,69 +0,0 @@ -%D \module -%D [ file=type-msw, -%D version=2005.02.04, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Microsoft Windows Fonts, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% \usetypescriptfile[type-msw] -% -% \definetypeface[verdana][ss][sans] [verdana] [default][encoding=texnansi] -% \definetypeface[verdana][rm][serif][palatino][default][encoding=texnansi,rscale=1.1] -% \definetypeface[verdana][mm][math] [palatino][default][encoding=texnansi,rscale=1.1] -% \definetypeface[verdana][tt][mono] [modern] [default][encoding=texnansi,rscale=1.25] -% -% \setupbodyfont[verdana] \showfontstrip -% -% \startlines -% {\rm test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}} -% {\ss test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}} -% {\tt test {\sl test} {\it test} {\bf test} {\bs test} {\bi test}} -% \stoplines - -\starttypescriptcollection[windows] - -% verdana - -\starttypescript [sans] [verdana] [name] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [Verdana] - \definefontsynonym [SansBold] [Verdana-Bold] - \definefontsynonym [SansItalic] [Verdana-Italic] - \definefontsynonym [SansBoldItalic] [Verdana-BoldItalic] -\stoptypescript - -\starttypescript [sans] [verdana] [texnansi,ec,qx] - \definefontsynonym [Verdana] [\typescriptthree-verdana] [encoding=\typescriptthree] - \definefontsynonym [Verdana-Bold] [\typescriptthree-verdanab] [encoding=\typescriptthree] - \definefontsynonym [Verdana-Italic] [\typescriptthree-verdanai] [encoding=\typescriptthree] - \definefontsynonym [Verdana-BoldItalic] [\typescriptthree-verdanaz] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-microsoft-verdana.map] -\stoptypescript - -% arial - -\starttypescript [sans] [arial] [name] - \setups[font:fallback:sans] - \definefontsynonym [Sans] [ArialMT] - \definefontsynonym [SansBold] [Arial-BoldMT] - \definefontsynonym [SansItalic] [Arial-ItalicMT] - \definefontsynonym [SansBoldItalic] [Arial-BoldItalicMT] -\stoptypescript - -\starttypescript [sans] [arial] [texnansi,ec,qx] - \definefontsynonym [ArialMT] [\typescriptthree-arial] [encoding=\typescriptthree] - \definefontsynonym [Arial-BoldMT] [\typescriptthree-arialbd] [encoding=\typescriptthree] - \definefontsynonym [Arial-ItalicMT] [\typescriptthree-ariali] [encoding=\typescriptthree] - \definefontsynonym [Arial-BoldItalicMT] [\typescriptthree-arialbi] [encoding=\typescriptthree] - \loadmapfile[\typescriptthree-microsoft-arial.map] -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkii/type-xtx.mkii b/Master/texmf-dist/tex/context/fonts/mkii/type-xtx.mkii deleted file mode 100644 index 3c5b06d9e45..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkii/type-xtx.mkii +++ /dev/null @@ -1,570 +0,0 @@ -%D \module -%D [ file=type-xtx, -%D version=2004.11.15, % prereleased earlier -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=\XETEX's font treasures, -%D author=Adam T. Lindsay etc, -%D date=\currentdate, -%D copyright={Adam Lindsay \& Hans Hagen \& ...}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D Note HH: this file probably needs to be adapted to the current names and -%D so but as I don't use \XETEX\ myself others have to provide information. - -%D Here are some fonts definitions that can get you started with -%D \XETEX\ (for more details see Adam's MyWay documents). -%D -%D Most typescripts in this file are mostly independent of the other -%D typescript files. Generally, you can speed things up a lot by -%D eliminating all but one of \CONTEXT's typescript files: -%D -%D \starttyping -%D \usetypescriptfiles[reset] % HH: watch out, new feature, since -%D \usetypescriptfiles[type-siz] % I disliked the low level redef. -%D \stoptyping -%D -%D The exceptions are the \quotation {legacy} fonts Times, Palatino, -%D Courier, and Helvetica, which also depend on \type {type-syn}. -%D -%D These following six typescripts call the basic four variants on any -%D given font, given the name of the \quotation {Regular} variant in the -%D name slot. These typescripts default to a Unicode encoding, -%D accepts sizes \quotation {default} and \quotation {dtp}, and are -%D activated with the identifiers \quotation {Xserif}, \quotation {Xsans}, -%D and \quotation {Xmono}. They can have relative scaling within the -%D typeface. Any of the following work: -%D -%D \starttyping -%D \definetypeface[basic][rm][Xserif][Baskerville] -%D \definetypeface[basic][ss][Xsans] [Optima Regular][default][features=default,rscale=0.87] -%D \definetypeface[basic][tt][Xmono] [Courier] [default] -%D \stoptyping -%D -%D Activate the typeface with: -%D -%D \starttyping -%D \setupbodyfont[basic] -%D \stoptyping - -%D This file is hacked by Taco Hoekwater in an attempt to figure out the right approach -%D to font loading in \XeTeX. (jun19,2007) - -%D The General \XeTeX\ low-level font syntax is (at least) as follows. -%D -%D Named font: -%D \starttyping -%D \font\x = "<fontname><engine-options>:<featurelist>" <at or scaled> -%D \stoptyping -%D \type{<fontname>} = Font name as seen in a system font menu or the output of fc-list -%D -%D \type{<engine-options>} = \type{/B} or \type{/I} or \tupe{/BI}, and||or \type{/S=<X>}. -%D That last one selects an optical scaled variant for size \type{<X>} -%D (it is a bare number, the unit is points). -%D -%D \type{<featurelist>} = comma- or semicolon- separated list of font features. -%D -%D Opentype features are selected using \type{+<tag>}, and deselected using \type{-<tag>}, -%D except that key||value pairs are used for \type{script=<tag>} and \type{language=<tag>} -%D -%D AAT features are always key||value pairs, often including spaces. -%D -%D \XETEX's own features are key||value pairs, and can be applied to both OpenType -%D and AAT fonts: -%D \type{mapping=<font map>} for glyph remapping -%D \type{color=RRGGBB[TT]} for color (hex numbers, with optional transparancy), -%D \type{letterspace=<x>} to add \type{<x>/<fontsize>} intercharacter spacing. -%D -%D Full example showing all parts of the syntax for an OTF font: -%D \starttyping -%D \font\f= "Warnock Pro/I/S=5:+smcp,-liga,mapping=tex-text,script=latn" -%D \stoptyping - -%D Non-installed (filename-based) fonts : -%D -%D \starttyping -%D \font\x = "[<fontname>]:<featurelist>" <at or scaled> -%D \stoptyping -%D -%D Here, there are no \type{<engine-options>}, because there is no -%D font discovery engine available to be queried. - -%D TH: This \type{\xetexcolon} definition seems needed because the name/file \ -%D parser otherwise drops the rest of the argument into oblivion. - -\unexpanded\def\xetexcolon{:} - -\starttypescriptcollection[xetex] - -\starttypescript[Xserif][all][name] - -%D TH: I removed all single quotes because they don't seem to add anything. And I added -%D the \type{name:} everywhere, because passing that information on \type{\typescripttwo} -%D doesn't work either (maybe \type{\typescripttwo} is expanded incorrectly) -%D -%D And even if that would have worked, \type{file:} will not work properly anyway -%D in this case since tricks like \type{/I} will never, ever work for local fonts, -%D so there is really only one choice. - -%D HH: todo, define feature set switch mapping=tex-tex - -\definefontsynonym[Dummy] [name:\typescripttwo] [features=default] -\definefontsynonym[DummyItalic] [name:\typescripttwo/I] [features=default] -\definefontsynonym[DummyBold] [name:\typescripttwo/B] [features=default] -\definefontsynonym[DummyBoldItalic][name:\typescripttwo/BI][features=default] - -\definefontsynonym[DummyCaps] [name:\typescripttwo] [features=smallcaps] - -\definefontsynonym[Serif] [Dummy] -\definefontsynonym[SerifBold] [DummyBold] -\definefontsynonym[SerifItalic] [DummyItalic] -\definefontsynonym[SerifBoldItalic] [DummyBoldItalic] -\definefontsynonym[SerifSlanted] [DummyItalic] -\definefontsynonym[SerifBoldSlanted][DummyBoldItalic] -\definefontsynonym[SerifCaps] [DummyCaps] - -\stoptypescript - -\starttypescript[Xsans][all][name] - -\definefontsynonym[DummySans] [name:\typescripttwo] [features=default] -\definefontsynonym[DummySansItalic] [name:\typescripttwo/I] [features=default] -\definefontsynonym[DummySansBold] [name:\typescripttwo/B] [features=default] -\definefontsynonym[DummySansBoldItalic][name:\typescripttwo/BI][features=default] - -\definefontsynonym[DummySansCaps] [name:\typescripttwo] [features=smallcaps] - -\definefontsynonym[Sans] [DummySans] -\definefontsynonym[SansBold] [DummySansBold] -\definefontsynonym[SansItalic] [DummySansItalic] -\definefontsynonym[SansBoldItalic] [DummySansBoldItalic] -\definefontsynonym[SansSlanted] [DummySansItalic] -\definefontsynonym[SansBoldSlanted][DummySansBoldItalic] -\definefontsynonym[SansCaps] [DummySansCaps] - -\stoptypescript - -\starttypescript[Xmono][all][name] - -\definefontsynonym[DummyMono] [name:\typescripttwo] -\definefontsynonym[DummyMonoItalic] [name:\typescripttwo/I] -\definefontsynonym[DummyMonoBold] [name:\typescripttwo/B] -\definefontsynonym[DummyMonoBoldItalic][name:\typescripttwo/BI] - -% TODO: smallcaps without other features - -\definefontsynonym[Mono] [DummyMono] -\definefontsynonym[MonoBold] [DummyMonoBold] -\definefontsynonym[MonoItalic] [DummyMonoItalic] -\definefontsynonym[MonoBoldItalic] [DummyMonoBoldItalic] -\definefontsynonym[MonoSlanted] [DummyMonoItalic] -\definefontsynonym[MonoBoldSlanted][DummyMonoBoldItalic] -\definefontsynonym[MonoCaps] [DummyMono] - -\stoptypescript - -\starttypescript[Xserif][default][size] - \definebodyfont - [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt] [rm] - [default] -\stoptypescript - -\starttypescript[Xsans][default][size] - \definebodyfont - [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt] - [ss] [default] -\stoptypescript - -\starttypescript [Xmono][default][size] - \definebodyfont - [4pt,5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,14.4pt,17.3pt] - [tt] [default] -\stoptypescript - -\starttypescript[Xserif][dtp][size] - \definebodyfont - [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt] - [rm] [default] -\stoptypescript - -\starttypescript[Xsans][dtp][size] - \definebodyfont - [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt] - [ss] [default] -\stoptypescript - -\starttypescript[Xmono][dtp][size] - \definebodyfont - [5pt,6pt,7pt,8pt,9pt,10pt,11pt,12pt,13pt,14pt,16pt,18pt,22pt,28pt] - [tt] [default] -\stoptypescript - -%D The following are \quotation {legacy} named fonts. Times, Palatino, -%D and Helvetica are familiar to most users of modern \TEX\ -%D systems. These versions are accessed via the Unicode encoding -%D enabled by \XETEX. There is no attempt to match metrics with -%D the actual legacy fonts. These are simply familiar names. - -%D These typescripts, unlike others in this file, depend on those in -%D \type{type-pre}. - -\starttypescript[serif][times][uc] - -\definefontsynonym[Times-Roman] [name:Times Roman] [features=default] -\definefontsynonym[Times-Italic] [name:Times Italic] [features=default] -\definefontsynonym[Times-Bold] [name:Times Bold] [features=default] -\definefontsynonym[Times-BoldItalic][name:Times Bold Italic][features=default] - -\stoptypescript - -%D Book Antiqua is Mac OS X's Palatino clone. - -\starttypescript[serif][palatino][uc] - -\definefontsynonym[Palatino] [name:Book Antiqua] [features=default] -\definefontsynonym[Palatino-Italic] [name:Book Antiqua Italic] [features=default] -\definefontsynonym[Palatino-Bold] [name:Book Antiqua Bold] [features=default] -\definefontsynonym[Palatino-BoldItalic] [name:Book Antiqua Bold Italic][features=default] - -\definefontsynonym[Palatino-Slanted] [Palatino-Italic] -\definefontsynonym[Palatino-BoldSlanted] [Palatino-BoldItalic] -\definefontsynonym[Palatino-Caps] [Palatino] - -\stoptypescript - -%D The default Helvetica doesn't have an oblique variant, so we'll -%D go ahead and name Helvertica Neue here. - -\starttypescript[sans][helvetica][uc] - -\definefontsynonym[Helvetica] [name:Helvetica Neue] [features=default] -\definefontsynonym[Helvetica-Oblique] [name:Helvetica Neue Italic] [features=default] -\definefontsynonym[Helvetica-Bold] [name:Helvetica Neue Bold] [features=default] -\definefontsynonym[Helvetica-BoldOblique][name:Helvetica Neue Bold Italic][features=default] - -\stoptypescript - -%D Courier, as delivered on MacOSX 10.3, doesn't have an oblique -%D variant, either. Unfortunately, none of the default Mono fonts in -%D MacOSX have oblique|/|italic versions! - -\starttypescript[mono][courier][uc] - -\definefontsynonym[Courier] [name:Courier] -\definefontsynonym[Courier-Oblique] [Courier] -\definefontsynonym[Courier-Bold] [name:Courier Bold] -\definefontsynonym[Courier-BoldOblique][Courier-Bold] - -\stoptypescript - -%D The following fonts go beyond the usual four variants that -%D are accessible via the above wildcard typescripts, so they -%D get a more expanded treatment here\xetexcolon - -\starttypescript[serif][hoefler][uc] - -\definefontsynonym[Hoefler] [name:Hoefler Text\xetexcolon mapping=tex-text;% - Ligatures=Diphthongs] [encoding=uc] -\definefontsynonym[HoeflerItalic][name:Hoefler Text Italic\xetexcolon mapping=tex-text;% - Ligatures=Diphthongs] [encoding=uc] -\definefontsynonym[HoeflerBlack] [name:Hoefler Text Black\xetexcolon mapping=tex-text;% - Ligatures=Diphthongs] [encoding=uc] -\definefontsynonym[HoeflerBlackItalic][name:Hoefler Text Black Italic\xetexcolon mapping=tex-text;% - Ligatures=Diphthongs] [encoding=uc] -\definefontsynonym[HoeflerSmCap] [name:Hoefler Text\xetexcolon mapping=tex-text;% - Ligatures=Diphthongs;% - Letter Case=Small Caps][encoding=uc] -\stoptypescript - -\starttypescript[serif][hoefler][name] - -\definefontsynonym[Serif] [Hoefler] -\definefontsynonym[SerifBold] [HoeflerBlack] -\definefontsynonym[SerifItalic] [HoeflerItalic] -\definefontsynonym[SerifBoldItalic] [HoeflerBlackItalic] -\definefontsynonym[SerifSlanted] [HoeflerItalic] -\definefontsynonym[SerifBoldSlanted][HoeflerBlackItalic] -\definefontsynonym[SerifCaps] [HoeflerSmCap] - -\stoptypescript - -\starttypescript[sans][lucidagrande][uc] - -\definefontsynonym[LucidaGrande] [name:Lucida Grande] [features=default] -\definefontsynonym[LucidaGrandeBold][name:Lucida Grande Bold][features=default] - -\stoptypescript - -\starttypescript[sans][lucidagrande][name] - -\definefontsynonym[Sans] [LucidaGrande] -\definefontsynonym[SansBold] [LucidaGrandeBold] -\definefontsynonym[SansItalic] [LucidaGrande] -\definefontsynonym[SansBoldItalic] [LucidaGrandeBold] -\definefontsynonym[SansSlanted] [LucidaGrande] -\definefontsynonym[SansBoldSlanted][LucidaGrandeBold] -\definefontsynonym[SansCaps] [LucidaGrande] - -\stoptypescript - -\starttypescript[sans][optima][uc] -\definefontsynonym[Optima] [name:Optima Regular] [features=default] -\definefontsynonym[OptimaItalic] [name:Optima Italic] [features=default] -\definefontsynonym[OptimaBold] [name:Optima Bold] [features=default] -\definefontsynonym[OptimaBoldItalic][name:Optima Bold Italic][features=default] -\definefontsynonym[OptimaBlack] [name:Optima ExtraBlack] [features=default] -\stoptypescript - -\starttypescript[sans][optima][name] - -\definefontsynonym[Sans] [Optima] -\definefontsynonym[SansBold] [OptimaBold] -\definefontsynonym[SansItalic] [OptimaItalic] -\definefontsynonym[SansBoldItalic] [OptimaBoldItalic] -\definefontsynonym[SansSlanted] [OptimaItalic] -\definefontsynonym[SansBoldSlanted][OptimaBoldItalic] -\definefontsynonym[SansCaps] [Optima] - -\stoptypescript - -\starttypescript[sans][gillsans,gillsanslt][uc] - -\definefontsynonym[GillSans] [name:Gill Sans] [features=default] -\definefontsynonym[GillSansItalic] [name:Gill Sans Italic] [features=default] -\definefontsynonym[GillSansBold] [name:Gill Sans Bold] [features=default] -\definefontsynonym[GillSansBoldItalic] [name:Gill Sans Bold Italic] [features=default] -\definefontsynonym[GillSansLight] [name:Gill Sans Light] [features=default] -\definefontsynonym[GillSansLightItalic][name:Gill Sans Light Italic][features=default] - -\stoptypescript - -\starttypescript[sans][gillsans][name] - -\definefontsynonym[Sans] [GillSans] -\definefontsynonym[SansBold] [GillSansBold] -\definefontsynonym[SansItalic] [GillSansItalic] -\definefontsynonym[SansBoldItalic] [GillSansBoldItalic] -\definefontsynonym[SansSlanted] [GillSansItalic] -\definefontsynonym[SansBoldSlanted][GillSansBoldItalic] -\definefontsynonym[SansCaps] [GillSans] - -\stoptypescript - -\starttypescript[sans][gillsanslt][name] - -\definefontsynonym[Sans] [GillSansLight] -\definefontsynonym[SansBold] [GillSans] -\definefontsynonym[SansItalic] [GillSansLightItalic] -\definefontsynonym[SansBoldItalic] [GillSansItalic] -\definefontsynonym[SansSlanted] [GillSansLightItalic] -\definefontsynonym[SansBoldSlanted][GillSansItalic] -\definefontsynonym[SansCaps] [GillSansLight] - -\stoptypescript - -\starttypescript[serif,handwriting][zapfino][uc] - -\definefontsynonym[ZapfinoOne] [name:Zapfino\xetexcolon mapping=tex-text] [encoding=uc] -\definefontsynonym[ZapfinoTwo] [name:Zapfino\xetexcolon mapping=tex-text;% - Stylistic Variants=First variant glyph set] [encoding=uc] -\definefontsynonym[ZapfinoThree][name:Zapfino\xetexcolon mapping=tex-text;% - Stylistic Variants=Second variant glyph set][encoding=uc] -\definefontsynonym[ZapfinoFour] [name:Zapfino\xetexcolon mapping=tex-text;% - Stylistic Variants=Third variant glyph set] [encoding=uc] -\stoptypescript - -\starttypescript[handwriting][zapfino][name] - -\definefontsynonym[Handwriting][ZapfinoOne] - -\stoptypescript - -\starttypescript[serif][zapfino][name] - -\definefontsynonym[Serif] [ZapfinoOne] -\definefontsynonym[SerifBold] [ZapfinoThree] -\definefontsynonym[SerifItalic] [ZapfinoTwo] -\definefontsynonym[SerifBoldItalic] [ZapfinoTwo] -\definefontsynonym[SerifSlanted] [ZapfinoThree] -\definefontsynonym[SerifBoldSlanted][ZapfinoThree] -\definefontsynonym[SerifCaps] [ZapfinoOne] - -\stoptypescript - -\starttypescript[serif,calligraphy][applechancery][uc] - -\definefontsynonym[AppleChanceryOne] [name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles] [encoding=uc] -\definefontsynonym[AppleChanceryTwo] [name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles;% - Design Complexity=Elegant Design Level][encoding=uc] -\definefontsynonym[AppleChanceryThree] [name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles;% - Design Complexity=Flourishes Set A] [encoding=uc] -\definefontsynonym[AppleChanceryFour] [name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles;% - Design Complexity=Flourishes Set B] [encoding=uc] -\definefontsynonym[AppleChanceryCaps] [name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles;% - Letter Case=Small Caps] [encoding=uc] -\definefontsynonym[AppleChanceryCapsTwo][name:Apple Chancery\xetexcolon mapping=tex-text;% - Number Case=Old Styles;% - Letter Case=Small Caps;% - Design Complexity=Flourishes Set B] [encoding=uc] -\stoptypescript - -\starttypescript[calligraphy][applechancery][name] - -\definefontsynonym[Calligraphy][AppleChanceryOne] - -\stoptypescript - -\starttypescript[serif][applechancery][name] - -\definefontsynonym[Serif] [AppleChanceryOne] -\definefontsynonym[SerifBold] [AppleChanceryThree] -\definefontsynonym[SerifItalic] [AppleChanceryTwo] -\definefontsynonym[SerifBoldItalic] [AppleChanceryFour] -\definefontsynonym[SerifSlanted] [AppleChanceryThree] -\definefontsynonym[SerifBoldSlanted][AppleChanceryFour] -\definefontsynonym[SerifCaps] [AppleChanceryCaps] - -\stoptypescript - -% MS Office 2004 for Mac has impressive Unicode coverage in many of its fonts. - -\starttypescript[serif][timesnewroman][uc] - -\definefontsynonym[MSTimes] [name:Times New Roman] [features=default] -\definefontsynonym[MSTimesItalic] [name:Times New Roman Italic] [features=default] -\definefontsynonym[MSTimesBold] [name:Times New Roman Bold] [features=default] -\definefontsynonym[MSTimesBoldItalic][name:Times New Roman Bold Italic][features=default] - -\stoptypescript - -\starttypescript[serif][timesnewroman][name] - -\definefontsynonym[Serif] [MSTimes] -\definefontsynonym[SerifBold] [MSTimesBold] -\definefontsynonym[SerifItalic] [MSTimesItalic] -\definefontsynonym[SerifBoldItalic] [MSTimesBoldItalic] -\definefontsynonym[SerifSlanted] [MSTimesItalic] -\definefontsynonym[SerifBoldSlanted][MSTimesBoldItalic] -\definefontsynonym[SerifCaps] [MSTimes] - -\stoptypescript - -\starttypescript[sans][arial][uc] - -\definefontsynonym[Arial] [name:Arial] [features=default] -\definefontsynonym[ArialItalic] [name:Arial Italic] [features=default] -\definefontsynonym[ArialBold] [name:Arial Bold] [features=default] -\definefontsynonym[ArialBoldItalic][name:Arial Bold Italic][features=default] - -\stoptypescript - -\starttypescript[sans][arial][name] - -\definefontsynonym[Sans] [Arial] -\definefontsynonym[SansBold] [ArialBold] -\definefontsynonym[SansItalic] [ArialItalic] -\definefontsynonym[SansBoldItalic] [ArialBoldItalic] -\definefontsynonym[SansSlanted] [ArialItalic] -\definefontsynonym[SansBoldSlanted][ArialBoldItalic] -\definefontsynonym[SansCaps] [Arial] - -\stoptypescript - -%D MS Office comes with an installation of the Lucida family in TrueType form. It's nice, -%D except\dots\ no math, no slanted, no caps and some other auxiliary fonts. - -\starttypescript [serif] [lucida] [uc] - - \definefontsynonym [LucidaBright] [name:Lucida Bright] [features=default] - \definefontsynonym [LucidaBright-Demi] [name:Lucida Bright Demibold][features=default] - \definefontsynonym [LucidaBright-DemiItalic] [name:Lucida Bright Demibold][features=default] - \definefontsynonym [LucidaBright-Italic] [name:Lucida Bright] [features=default] - - \definefontsynonym [LucidaBrightSmallcaps] [LucidaBright] - \definefontsynonym [LucidaBrightSmallcaps-Demi][LucidaBright-Demi] - \definefontsynonym [LucidaBright-Oblique] [LucidaBright-Italic] - -\stoptypescript - -\starttypescript [sans] [lucida] [uc] - \definefontsynonym [LucidaSans] [name:Lucida Sans Regular] [features=default] - \definefontsynonym [LucidaSans-Demi] [name:Lucida Sans Demibold Roman] [features=default] - \definefontsynonym [LucidaSans-DemiItalic][name:Lucida Sans Demibold Italic][features=default] - \definefontsynonym [LucidaSans-Italic] [name:Lucida Sans Italic] [features=default] - - \definefontsynonym [LucidaSans-Bold] [LucidaSans-Demi] - \definefontsynonym [LucidaSans-BoldItalic][LucidaSans-DemiItalic] - -\stoptypescript - -\starttypescript [mono] [lucida] [uc] - - \definefontsynonym [LucidaSans-Typewriter] [name:Lucida Sans Typewriter Regular] [encoding=uc] - \definefontsynonym [LucidaSans-TypewriterBold] [name:Lucida Sans Typewriter Bold] [encoding=uc] - \definefontsynonym [LucidaSans-TypewriterBoldOblique][name:Lucida Sans Typewriter Bold Oblique][encoding=uc] - \definefontsynonym [LucidaSans-TypewriterOblique] [name:Lucida Sans Typewriter Oblique] [encoding=uc] - -\stoptypescript - -\starttypescript [calligraphy] [lucida] [uc] - - \definefontsynonym[LucidaCalligraphy-Italic][name:Lucida Calligraphy Italic][features=default] - -\stoptypescript - -% No casual that I know of - -\starttypescript[handwriting][lucida][uc] - - \definefontsynonym[LucidaHandwriting-Italic][name:Lucida Handwriting Italic][features=default] - -\stoptypescript - -\starttypescript[fax][lucida][uc] - - \definefontsynonym[LucidaFax] [name:Lucida Fax Regular] [features=default] - \definefontsynonym[LucidaFax-Demi] [name:Lucida Fax Demibold] [features=default] - \definefontsynonym[LucidaFax-DemiItalic][name:Lucida Fax Demibold Italic][features=default] - \definefontsynonym[LucidaFax-Italic] [name:Lucida Fax Italic] [features=default] - -\stoptypescript - -%D Gentium is from SIL, the fine makers of \XETEX, and it's not only very complete with -%D Roman and Italic Unicode support, but very attractive. - -\starttypescript [serif] [gentium] - \definefontsynonym [Gentium-Roman] [file:GentiumPlus-R] [features=default] - \definefontsynonym [Gentium-Italic] [file:GentiumPlus-I] [features=default] - \definefontsynonym [Gentium-Bold] [file:GenBasB] [features=default] - \definefontsynonym [Gentium-BoldItalic] [file:GenBasBI] [features=default] - \definefontsynonym [Gentium-Slanted] [Gentium-Italic] - \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic] - \definefontsynonym [Gentium-RomanCaps] [file:GentiumPlus-R] [features=smallcaps] -\stoptypescript - -\starttypescript [serif] [gentium] [name] - \definefontsynonym [Serif] [Gentium-Roman] - \definefontsynonym [SerifItalic] [Gentium-Italic] - \definefontsynonym [SerifBold] [Gentium-Bold] - \definefontsynonym [SerifBoldItalic] [Gentium-BoldItalic] - \definefontsynonym [SerifSlanted] [Gentium-Slanted] - \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted] - \definefontsynonym [SerifCaps] [Serif] - \definefontsynonym [OldStyle] [Serif] - \definefontsynonym [SerifCaps] [Gentium-RomanCaps] -\stoptypescript - -\starttypescript [gentium] - \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default] -\stoptypescript - -\stoptypescriptcollection - -\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg index 112a3f9a7a9..5bbd2cf6ce5 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/antykwa-math.lfg @@ -1,11 +1,115 @@ -local msam = { name = "msam10.tfm", vector = "tex-ma" } -local msbm = { name = "msbm10.tfm", vector = "tex-mb" } +local common = fonts.goodies.load("common-math-jmn.lfg") +local helpers = common.mathematics.helpers + +if not fonts.encodings.math["extensible-jmn-private"] then + + local nps = fonts.helpers.newprivateslot + + fonts.encodings.math["extensible-jmn-private"] = { + [nps("rule middle piece")] = 200, -- minusjmn + [nps("rule right piece")] = 201, -- minusrightjmn + [nps("rule left piece")] = 202, -- minusleftjmn + [nps("double rule middle piece")] = 203, -- equaljmn + [nps("double rule right piece")] = 204, -- equalrightjmn + [nps("double rule left piece")] = 205, -- equalleftjmn + [nps("arrow left piece")] = 206, -- arrowleftjmn + [nps("arrow right piece")] = 207, -- arrowrightjmn + [nps("double arrow left piece")] = 208, -- arrowdblleftjmn + [nps("double arrow right piece")] = 209, -- arrowdblrightjmn + } + +end + +local fraction = .25 + +local badones = { + summationtext = fraction, + producttext = fraction, + integraltext = fraction, + uniontext = fraction, + intersectiontext = fraction, + unionmultitext = fraction, + logicalandtext = fraction, + logicalortext = fraction, + summationdisplay = fraction, + productdisplay = fraction, + integraldisplay = fraction, + uniondisplay = fraction, + intersectiondisplay = fraction, + unionmultidisplay = fraction, + logicalanddisplay = fraction, + logicalordisplay = fraction, + coproducttext = fraction, + coproductdisplay = fraction, + + braceleftBig = fraction, + braceleftBigg = fraction, + braceleftbig = fraction, + braceleftbigg = fraction, + parenleftBig = fraction, + parenleftBigg = fraction, + parenleftbig = fraction, + parenleftbigg = fraction, + bracketleftBig = fraction, + bracketleftBigg = fraction, + bracketleftbig = fraction, + bracketleftbigg = fraction, + ceilingleftBig = fraction, + ceilingleftBigg = fraction, + ceilingleftbig = fraction, + ceilingleftbigg = fraction, + floorleftBig = fraction, + floorleftBigg = fraction, + floorleftbig = fraction, + floorleftbigg = fraction, + anglebracketleftBig = fraction, + anglebracketleftBigg = fraction, + anglebracketleftbig = fraction, + anglebracketleftbigg = fraction, + + bracerightBig = fraction, + bracerightBigg = fraction, + bracerightbig = fraction, + bracerightbigg = fraction, + parenrightBig = fraction, + parenrightBigg = fraction, + parenrightbig = fraction, + parenrightbigg = fraction, + bracketrightBig = fraction, + bracketrightBigg = fraction, + bracketrightbig = fraction, + bracketrightbigg = fraction, + ceilingrightBig = fraction, + ceilingrightBigg = fraction, + ceilingrightbig = fraction, + ceilingrightbigg = fraction, + floorrightBig = fraction, + floorrightBigg = fraction, + floorrightbig = fraction, + floorrightbigg = fraction, + anglebracketrightBig = fraction, + anglebracketrightBigg = fraction, + anglebracketrightbig = fraction, + anglebracketrightbigg = fraction, + + backslashBig = fraction, + backslashBigg = fraction, + backslashbig = fraction, + backslashbigg = fraction, +} + +local uglyones = { + braceleft = true, + braceright = true, + vextendsingle = true, + vextenddouble = true, +} return { name = "antykwa-math", version = "1.00", comment = "Goodies that complement antykwa math.", - author = "Hans, Mojca, Aditya", + author = "Hans, Mojca, Aditya, Mikael", copyright = "ConTeXt development team", mathematics = { mapfiles = { @@ -13,45 +117,65 @@ return { "antt-mi.map", "antt-sy.map", "antt-ex.map", - "mkiv-base.map", + -- "mkiv-base.map", + }, + variables = { + notshiftfactor = 0.075, }, virtuals = { ["antykwa-math"] = { - { name = "file:AntykwaTorunska-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa", main = true, parameters = false }, + -- + { name = "rm-anttr.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttri.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttr.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttbi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttb.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true + { name = "sy-anttrz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, + { name = "file:AntykwaTorunska-Regular", vector = "tex-ex-braces", backmap = false }, + { name = "ex-anttr.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, ["antykwa-light-math"] = { - { name = "file:AntykwaTorunskaLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-light", main = true, parameters = false }, + -- + { name = "rm-anttl.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttli.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttli.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttl.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true + { name = "sy-anttlz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, + { name = "file:AntykwaTorunskaLight-Regular", vector = "tex-ex-braces", backmap = false }, + { name = "ex-anttl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, }, ["antykwa-cond-math"] = { - { name = "file:AntykwaTorunskaCond-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-cond", main = true, parameters = false }, + -- + { name = "rm-anttcr.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttcri.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttcri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttcbi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttcb.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true + { name = "sy-anttcrz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, + { name = "file:AntykwaTorunskaCond-Regular", vector = "tex-ex-braces", backmap = false }, + { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, }, ["antykwa-lightcond-math"] = { - { name = "file:AntykwaTorunskaCondLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-lightcond", main = true, parameters = false }, + -- + { name = "rm-anttcl.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttcli.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttcli.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttcri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttcr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true + { name = "sy-anttclz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, + { name = "file:AntykwaTorunskaCondLight-Regular", vector = "tex-ex-braces", backmap = false }, + { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, } - } + }, + addmissing = helpers.addmissing, } } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/asana-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/asana-math.lfg deleted file mode 100644 index 5b47b3ff8cc..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkiv/asana-math.lfg +++ /dev/null @@ -1,66 +0,0 @@ --- This patch code is moved from font-pat.lua to this goodies --- files as it does not belong in the core code. - -local patches = fonts.handlers.otf.enhancers.patches - -local function patch(data,filename,threshold) - local m = data.metadata.math - if m then - local d = m.DisplayOperatorMinHeight or 0 - if d < threshold then - patches.report("DisplayOperatorMinHeight(%s -> %s)",d,threshold) - m.DisplayOperatorMinHeight = threshold - end - end -end - -patches.register("after","analyze math","asana",function(data,filename) patch(data,filename,1350) end) - -local function less(value,target,original) - -- officially we should check the original - return 0.25 * value -end - -local function more(value,target,original) - local o = original.mathparameters.DisplayOperatorMinHeight - if o < 2800 then - return 2800 * target.parameters.factor - else - return value -- already scaled - end -end - - -return { - name = "asana-math", - version = "1.00", - comment = "Goodies that complement asana.", - author = "Hans Hagen", - copyright = "ConTeXt development team", - mathematics = { - parameters = { - -- DisplayOperatorMinHeight = 0, -- more - -- StackBottomDisplayStyleShiftDown = 0, - -- StackBottomShiftDown = 0, - -- StackDisplayStyleGapMin = 0, - -- StackGapMin = 0, - -- StackTopDisplayStyleShiftUp = 0, - -- StackTopShiftUp = 0, - -- StretchStackBottomShiftDown = 0, - -- StretchStackGapAboveMin = 0, - -- StretchStackGapBelowMin = 0, - -- StretchStackTopShiftUp = 0, - StackBottomDisplayStyleShiftDown = less, - StackBottomShiftDown = less, - StackDisplayStyleGapMin = less, - StackGapMin = less, - StackTopDisplayStyleShiftUp = less, - StackTopShiftUp = less, - StretchStackBottomShiftDown = less, - StretchStackGapAboveMin = less, - StretchStackGapBelowMin = less, - StretchStackTopShiftUp = less, - } - } -} - diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg index 51ca2d7f19b..56262eb3264 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg @@ -1,36 +1,320 @@ -local kern_V = { bottomright = { { kern = -200 } } } -local kern_W = { bottomright = { { kern = -100 } } } -local offset_f = { xoffset = "llx" } +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets --- Beware of updates in ssty slots! +local integral_variants = { bottomright = -0.20 } +local integral_top = { topright = 0 } +local integral_bottom = { bottomright = -0.10 } -- if too big it looks bad with triple integrals return { name = "bonum-math", version = "1.00", comment = "Goodies that complement bonum.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { - dimensions = { - default = { - -- [0x1D453] = offset_f, -- 𝑓 - -- ["1:0x1D453"] = offset_f, -- needed for compact - -- ["2:0x1D453"] = offset_f, -- needed for compact - ["*:0x1D453"] = offset_f, -- 𝑓 - }, + parameters = { + AccentTopShiftUp = -15, + FlattenedAccentTopShiftUp = -15, + AccentBaseDepth = 50, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1900, -- 1250 in font + SubscriptShiftDown = 201, -- 231 in font + SuperscriptShiftUp = 364, -- 334 in font + SubscriptShiftDownWithSuperscript = "1.4*SubscriptShiftDown", -- trial and error + PrimeShiftUp = "1.25*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.25*SuperscriptShiftUp", }, - kerns = { - -- [0x1D449] = kern_V, -- 𝑉 - -- ["1:0x1D449"] = kern_V, -- needed for compact - -- ["2:0x1D449"] = kern_V, -- needed for compact - -- [0x1D44A] = kern_W, -- 𝑊 - -- ["1:0x1D44A"] = kern_W, -- needed for compact - -- ["2:0x1D44A"] = kern_W, -- needed for compact - ["*:0x1D449"] = kern_V, -- 𝑉 - ["*:0x1D44A"] = kern_W, -- 𝑊 + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.005", + }, + { + tweak = "fixprimes", + factor = 0.77, + }, + { + tweak = "addmirrors", + }, + { + tweak = "replacealphabets", + list = { + { + source = { first = 0x003B1 }, -- upright alpha + filename = "texgyrebonummath-companion.otf", + }, + { + source = { first = 0x1D6FC }, -- italic alpha + filename = "texgyrebonummath-companion.otf", + }, + { + source = { first = 0x1D6C2 }, -- bold upright alpha + filename = "texgyrebonummath-companion.otf", + }, + { + source = { first = 0x1D736 }, -- bold italic alpha + filename = "texgyrebonummath-companion.otf", + }, + }, + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.98 }, + presets.rsfsuprighttoscript { rscale = 0.98 }, + presets.moderntocalligraphic { rscale = 0.98 }, + presets.eulertocalligraphic { rscale = 0.98 }, + presets.xitsarabic { rscale = 1 }, + presets.fallbacks { }, + presets.moveintegrals { factor = 1.5 }, + presets.moveitalics { correct = true }, + presets.wipeanchors { }, + presets.wipeitalics { }, + { + -- We need to check these, are the tweaks necessary or not? + tweak = "dimensions", + list = { + ["lowercasefraktur"] = { + width = 1.25, + extend = 1.25, + height = 1.15, + depth = 1.15, + squeeze = 1.15, + }, + + ["lowercasescript"] = { + factor = 1.2, + }, + }, + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x002F.variants.*"] = { topleft = -0.2, bottomright = -0.2 }, + [0x007D] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7D.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + [0x0029] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + [0x221A] = { topright = 0.2, bottomright = 0.2 }, -- radical + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, + ["0x221A.parts.top"] = { topright = 0.2, }, + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x1D465] = { bottomright = -0.05, }, -- italic x (ic is too large) + [0x00393] = { bottomright = -0.30, }, -- upright Gamma + [0x1D43F] = { bottomright = 0.01, }, -- upright L + ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int + ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint + ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint + ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "flattenaccents", + squeeze = 0.8, + height = 0.9, + offset = 0.1, + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = .1, vfactor = .3 }, + ["0x221A.variants.*"] = { location = "left", hfactor = .1, vfactor = .625 }, + ["0x221A.variants.1"] = { location = "left", hfactor = .1, vfactor = .575 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = .1, vfactor = 1.15 }, + } + }, + { + tweak = "dimensions", + list = { + -- [0x007D] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7C"] = { width = 1.4, xoffset=0.2 }, -- vertical bar + -- ["0x7C.variants.*"] = { width = 1, extend = 2.4 }, -- vertical bar + -- ["0x7C.parts.top"] = { , }, -- vertical bar + -- ["0x7C.parts.bottom"] = { bottomright = -0.15 }, -- vertical bar + }, + }, + + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. But none for Bonum. + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + -- This one fakes margins to get larger/smaller accents with for example the + -- \widetilde. + tweak = "margins", + list = { + [0x1D7DC] = { left = -.1, right = -.1 }, -- doublestruck 4 + + [0x1D712] = { left = -.1, right = -.1 }, -- italic chi + [0x1D713] = { left = -.1, right = -.1 }, -- italic psi + [0x1D714] = { left = -.1, right = -.1 }, -- italic omega + + [0x003B1] = { left = -.1, right = -.1 }, -- upright alpha + [0x003B3] = { left = -.1, right = -.1 }, -- upright gamma + [0x003BA] = { left = -.1, right = -.1 }, -- upright kappa + [0x003BC] = { left = -.1, right = -.1 }, -- upright mu + [0x003C0] = { left = -.1, right = -.1 }, -- upright pi + [0x003C3] = { left = -.1, right = -.1 }, -- upright sigma + [0x003C5] = { left = -.1, right = -.1 }, -- upright upsilon + [0x003C6] = { left = -.1, right = -.1 }, -- upright phi + [0x003C8] = { left = -.1, right = -.1 }, -- upright psi + [0x003C9] = { left = -.1, right = -.1 }, -- upright omega + + -- Greek lowercase sans (bold, italic) can be improved + + [0x1D451] = { left = -.1, right = -.1 }, -- italic d + [0x1D453] = { left = -.1, right = -.1 }, -- italic f + + [0x00394] = { left = .1, right = .1 }, -- upright Delta + [0x003A3] = { left = .1, right = .1 }, -- upright Sigma + + [0x00046] = { left = .1, right = .1 }, -- F + [0x0004C] = { left = .1, right = .1 }, -- L + [0x00050] = { left = .1, right = .1 }, -- P + [0x00053] = { left = .1, right = .1 }, -- S + [0x00054] = { left = .1, right = .1 }, -- T + [0x0005A] = { left = .1, right = .1 }, -- Z + + [0x1D43D] = { left = -.1, right = -.1 }, -- italic J + [0x1D44B] = { left = -.05, right = -.05 }, -- italic X + }, + }, + { + -- The v could have a bit more sidebearing + tweak = "dimensions", + list = { + ["0x1D463"] = { width = 1.075, }, -- italic v + }, + }, + { + tweak = "addprivates", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + -- This tweak is only needed for the funny arrows and these now get properly + -- centered. (Could actually be done in the engine). + tweak = "addarrows", + -- These are for documentation purposed as they are the defaults anyway: + left = 0.05, + right = 0.05, + slack = 0.10, + -- The equal doesn't really match the double arrows, as in plain etc, so it still + -- looks somewhat bad when zoomed in. This is the best we could do. Anyway, this + -- in only used when testing (forced) so it doesn't kick in normally. + list = { [0x3D] = { squeeze = .85, yoffset = .0975 } } + }, + { + -- Do we need these in the future? + -- Maybe a more general setup? + -- Maybe "reset llx" + tweak = "kernpairs", + list = { + [mathematics.tweaks.subsets.acenorsuvxz] = { + [0x1D453] = -.1, -- f + [0x1D457] = -.1, -- j + }, + [mathematics.tweaks.subsets.bhklt] = { + [0x1D453] = -.1, -- f + [0x1D457] = -.1, -- j + }, + [mathematics.tweaks.subsets.d] = { + [0x1D453] = -.075, -- f + [0x1D457] = -.075, -- j + }, + [mathematics.tweaks.subsets.f] = { + -- [mathematics.tweaks.subsets.aceimnorsuvwxz] = -.05, + [mathematics.tweaks.subsets.gjqy] = -.15, + [0x1D453] = -.2, -- ff + }, + [mathematics.tweaks.subsets.i] = { + [0x1D453] = -.2, -- f + [0x1D457] = -.2, -- j + }, + [mathematics.tweaks.subsets.mw] = { + [0x1D453] = -.05, -- f + [0x1D457] = -.05, -- j + }, + [mathematics.tweaks.subsets.p] = { + [0x1D453] = -.05, -- f + [0x1D457] = -.05, -- j + }, + [0x1D45F] = { -- r + [0x1D460] = -.1, -- s + }, + } + }, + { + tweak = "addbars", + advance = 0.475, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, }, + bigslots = { + 1, 3, 5, 7 + }, }, } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg index c18854d182c..a855a2513c3 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/cambria-math.lfg @@ -1,69 +1,165 @@ --- This patch code is moved from font-pat.lua to this goodies --- files as it does not belong in the core code. - --- This is a fix to the font itself i.e. the cached instance will --- be patched. When the goodie file is loaded the patch will be --- added to the patch list. No goodies setting is needed with --- the filename. - -local patches = fonts.handlers.otf.enhancers.patches - -local function patch(data,filename,threshold) - local m = data.metadata.math - if m then - local d = m.DisplayOperatorMinHeight or 0 - if d < threshold then - patches.report("DisplayOperatorMinHeight(%s -> %s)",d,threshold) - m.DisplayOperatorMinHeight = threshold - end - end -end - -patches.register("after","analyze math","cambria", function(data,filename) patch(data,filename,2800) end) -patches.register("after","analyze math","cambmath",function(data,filename) patch(data,filename,2800) end) - --- This is a runtime fix, but then we need to explicitly set --- the goodies parameter for the font. As a demonstration we --- we do both. - -local function FixDisplayOperatorMinHeight(value,target,original) - local o = original.mathparameters.DisplayOperatorMinHeight - if o < 2800 then - return 2800 * target.parameters.factor - else - return value -- already scaled - end -end +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets return { name = "cambria-math", version = "1.00", comment = "Goodies that complement cambria.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { parameters = { - DisplayOperatorMinHeight = FixDisplayOperatorMinHeight, + AccentBaseDepth = 300, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 2800, -- 2500 in font + PrimeShiftUp = "1.25*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.25*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.97 }, + presets.rsfsuprighttoscript { rscale = 0.97 }, + presets.moderntocalligraphic { rscale = 0.97 }, + presets.eulertocalligraphic { rscale = 0.97 }, + presets.xitsarabic { rscale = 0.95 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5}, -- needs checking + presets.wipeitalics { }, + presets.pagellaradical { }, + { + tweak = "simplifykerns", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x002F.variants.*"] = { topleft = -0.2, bottomright = -0.2 }, + -- + [0x007D] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7D.variants.*"] = { topright = -0.10, bottomright = -0.10 }, -- right brace variants + ["0x7D.parts.top"] = { topright = -0.10, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.10 }, -- right brace bottom + [0x0029] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + [0x221A] = { topright = 0.2, bottomright = 0.2 }, -- radical + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, + ["0x221A.parts.top"] = { topright = 0.2, }, + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- Keep as example. not needed in cambria (after all it is the reference): + [0x2A0C] = { bottomright = -0.1 }, -- iiiint does not have any ic + }, + }, + + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = -0.15, vfactor = .75 }, + ["0x221A.variants.*"] = { location = "left", hfactor = -0.1, vfactor = .15 }, + ["0x221A.variants.1"] = { location = "left", hfactor = -0.1, vfactor = .55 }, + ["0x221A.variants.2"] = { location = "left", hfactor = -0.1, vfactor = .375 }, + ["0x221A.variants.3"] = { location = "left", hfactor = -0.1, vfactor = .275 }, + ["0x221A.variants.4"] = { location = "left", hfactor = -0.1, vfactor = .22 }, + ["0x221A.variants.5"] = { location = "left", hfactor = -0.1, vfactor = .175 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = -0.1, vfactor = 0.95 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widehat + [0x00303] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widetilde + [0x00306] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widebreve + [0x0030C] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. + { + tweak = "dimensions", + list = { + -- here we want to apply to all + [0x020DB] = { yoffset = -0.03, height = .95, all = true }, -- widedddot : 0x20DB (self) + }, + }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + + { + tweak = "fixprimes", + factor = 0.83, + fake = 0.8, + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + list = { "over", "under" }, + }, + { + tweak = "addrules", + }, + { + tweak = "wipecues", + }, + { + tweak = "addarrows", + }, + { + tweak = "fixslashes", + }, + { + tweak = "addbars", + advance = 0.33, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "addprimed", + }, + }, + }, + bigslots = { + 1, 2, 3, 4 }, - -- kernpairs = { -- \setupmathematics[kernpairs=yes] - -- [0x1D44E] = { - -- [0x1D44F] = 1000, -- 𝑎𝑏 demo - -- } - -- }, - -- kerns = { - -- [0x1D453] = { - -- force = true, - -- topright = { - -- { - -- kern = 1000, - -- }, - -- }, - -- bottomright = { - -- { - -- kern = 1000, - -- }, - -- }, - -- }, - -- }, }, } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg new file mode 100644 index 00000000000..331d65a5d5a --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/common-math-jmn.lfg @@ -0,0 +1,119 @@ +return { + name = "common-math-jmn", + version = "1.00", + comment = "Goodies that complement the JMN collection.", + author = "Hans, Mikael", + copyright = "ConTeXt development team", + mathematics = { + helpers = { + addmissing = function(main) + + local builders = fonts.handlers.vf.math.builders + local ps = fonts.helpers.privateslot + + local characters = main.characters + local variables = main.goodies.mathematics and main.goodies.mathematics.variables or { } + local joinrelfactor = variables.joinrelfactor or 3 + local notshiftfactor = variables.notshiftfactor or 0 + + local umbracepiece = ps("um brace piece") + local lmbracepiece = ps("lm brace piece") + local cmbracepiece = ps("cm brace piece") + + local ulbracepiece = ps("ul brace piece") + local urbracepiece = ps("ur brace piece") + local llbracepiece = ps("ll brace piece") + local lrbracepiece = ps("lr brace piece") + + builders.brace(main,0x23DE,ulbracepiece,cmbracepiece,lrbracepiece,llbracepiece,cmbracepiece,urbracepiece) + builders.brace(main,0x23DF,llbracepiece,cmbracepiece,urbracepiece,ulbracepiece,cmbracepiece,lrbracepiece) + + builders.parent(main,0x23DC,ulbracepiece,umbracepiece,urbracepiece,"top") + builders.parent(main,0x23DD,llbracepiece,lmbracepiece,lrbracepiece,"bottom") + + builders.dots(main,0x2026) -- ldots + builders.dots(main,0x22EE) -- vdots + builders.dots(main,0x22EF) -- cdots + builders.dots(main,0x22F1) -- ddots + builders.dots(main,0x22F0) -- udots + + builders.jointwo(main,0x21A6,ps("maps to piece"),.15,0x02192) -- \mapstochar\rightarrow + + local srm = ps("rule middle piece") + local srr = ps("rule right piece") + local srl = ps("rule left piece") + + local drm = ps("double rule middle piece") + local drr = ps("double rule right piece") + local drl = ps("double rule left piece") + + local sal = ps("arrow left piece") + local sar = ps("arrow right piece") + + local dal = ps("double arrow left piece") + local dar = ps("double arrow right piece") + + local rad = ps("radical bar extender") + + if characters[srm] then + + builders.jointwo(main,0x27F5,sak,joinrelfactor,srr) + builders.jointwo(main,0x27F6,srl,joinrelfactor,sar) + builders.jointwo(main,0x27F7,sak,joinrelfactor,sar) + builders.jointwo(main,0x27F8,dal,joinrelfactor,drr) + builders.jointwo(main,0x27F9,drl,joinrelfactor,dar) + builders.jointwo(main,0x27FA,dal,joinrelfactor,dar) + + builders.horibar(main,0x203E,srm,srl,srr,0x02212) -- overbar underbar fraction (we take 90/91/92 too!) + -- builders.horibar(main,0x203E,srm,srl,srr,0x0002D) -- overbar underbar fraction (we take 90/91/92 too!) + + builders.rootbar(main,ps("radical bar extender"),srm,srr,0x02212) -- radical + + else + + builders.jointwo(main,0x27F5,0x02190,joinrelfactor,0x0002D) -- \leftarrow\joinrel\relbar + builders.jointwo(main,0x27F6,0x0002D,joinrelfactor,0x02192) -- \relbar\joinrel\rightarrow + builders.jointwo(main,0x27F7,0x02190,joinrelfactor,0x02192) -- \leftarrow\joinrel\rightarrow + builders.jointwo(main,0x27F8,0x021D0,joinrelfactor,0x0003D) -- \Leftarrow\joinrel\Relbar + builders.jointwo(main,0x27F9,0x0003D,joinrelfactor,0x021D2) -- \Relbar\joinrel\Rightarrow + builders.jointwo(main,0x27FA,0x021D0,joinrelfactor,0x021D2) -- \Leftarrow\joinrel\Rightarrow + + builders.horibar(main,0x203E,0xFE073) -- overbar underbar + + end + + builders.jointwo(main,0x2016,0x007C,0.20,0x007C) + builders.jointwo(main,0x2980,0x007C,0.20,0x007C,0.20,0x007C) + + characters[0x007C].extensible = true + characters[0x007C].varianttemplate = 0x5B + characters[0x2016].extensible = true + characters[0x2016].varianttemplate = 0x5B + characters[0x2980].extensible = true + characters[0x2980].varianttemplate = 0x5B + + -- 21CB leftrightharpoon + -- 21CC rightleftharpoon + + builders.stack(main,0x2259,0x0003D,3,0x02227) -- \buildrel\wedge\over= + + builders.jointwo(main,0x22C8,0x022B3,joinrelfactor,0x022B2) -- \mathrel\triangleright\joinrel\mathrel\triangleleft (4 looks better than 3) + builders.jointwo(main,0x22A7,0x0007C,joinrelfactor,0x0003D) -- \mathrel|\joinrel= + + builders.overlaytwo(main,0x2260,0x00338,notshiftfactor,0x0003D) -- \not\equal + builders.overlaytwo(main,0x2284,0x00338,notshiftfactor,0x02282) -- \not\subset + builders.overlaytwo(main,0x2285,0x00338,notshiftfactor,0x02283) -- \not\supset + builders.overlaytwo(main,0x2209,0x00338,notshiftfactor,0x02208) -- \not\in + + builders.jointwo(main,0x2254,0x03A,0,0x03D) -- := (≔) + + builders.repeated(main,0x222B,0x222B,1,1/2) + builders.repeated(main,0x222C,0x222B,2,1/2) + builders.repeated(main,0x222D,0x222B,3,1/2) + + characters[0x02B9] = characters[0x2032] -- we're nice + + end + } + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg new file mode 100644 index 00000000000..45e46d865b6 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/common-math.lfg @@ -0,0 +1,307 @@ +return { + name = "common-math", + version = "1.00", + comment = "Goodies that complement pagella.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + tweaks = { + presets = { + fallbacks = function(parameters) + return { + tweak = "fallbacks", + } + end, + scripttocalligraphic = function(parameters) + return { + tweak = "replacealphabets", + feature = "scripttocalligraphic", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + }, + }, + } + end, + moderntocalligraphic = function(parameters) + return { + tweak = "replacealphabets", + feature = "moderntocalligraphic", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + filename = "latinmodern-math.otf", + rscale = parameters.rscale, + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + filename = "latinmodern-math.otf", + rscale = parameters.rscale, + }, + }, + } + end, + eulertocalligraphic = function(parameters) + return { + tweak = "replacealphabets", + feature = "eulertocalligraphic", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + filename = "euler-math.otf", + rscale = parameters.rscale, + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + filename = "euler-math.otf", + rscale = parameters.rscale, + }, + }, + } + end, + rsfstoscript = function(parameters) + return { + tweak = "replacealphabets", + feature = "rsfstoscript", + list = { + { + source = "uppercasescript", + target = "uppercasescript", + filename = "ralphsmithsformalscript-companion.otf", + rscale = parameters.rscale, + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldscript", + filename = "ralphsmithsformalscript-companion.otf", + rscale = parameters.rscale, + }, + }, + } + end, + rsfsuprighttoscript = function(parameters) + return { + tweak = "replacealphabets", + feature = "rsfsuprighttoscript", + list = { + { + source = "uppercasescript", + target = "uppercasescript", + filename = "ralphsmithsformalscript-companion.otf", + rscale = parameters.rscale, + feature = "ss01", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldscript", + filename = "ralphsmithsformalscript-companion.otf", + rscale = parameters.rscale, + feature = "ss01", + }, + }, + } + end, + braille = function(parameters) + return { + tweak = "replacealphabets", + feature = "braille", + list = { + { + source = "braillepatterns", + target = "braillepatterns", + filename = "dejavuserif.ttf", + rscale = parameters.rscale, + }, + }, + } + end, + xitsarabic = function(parameters) + return { + tweak = "replacealphabets", + feature = "xitsarabic", + list = { + { + source = "arabicmathematicalalphabeticsymbols", + target = "arabicmathematicalalphabeticsymbols", + filename = "xitsmath-companion.otf", + rscale = parameters.rscale, + }, + { + source = "digitsarabicindic", + target = "digitsarabicindic", + filename = "xitsmath-companion.otf", + rscale = parameters.rscale, + }, + { + source = "digitsextendedarabicindic", + target = "digitsextendedarabicindic", + filename = "xitsmath-companion.otf", + rscale = parameters.rscale, + }, + }, + } + end, + moveitalics = function(parameters) + return { + tweak = "moveitalics", + correct = parameters.correct, + list = (parameters.all and "all") or (parameters.letters and "letters") or { + -- + "lowercasenormal", + "lowercaseitalic", + "lowercasebold", + "lowercasebolditalic", + "lowercasegreeknormal", + "lowercasegreekitalic", + "lowercasegreekbold", + "lowercasegreekbolditalic", + "lowercaseboldfraktur", + "lowercaseboldscript", + "lowercasedoublestruck", + "lowercasefraktur", + "lowercasegreeksansserifbold", + "lowercasegreeksansserifbolditalic", + "lowercasemonospace", + "lowercasesansserifbold", + "lowercasesansserifbolditalic", + "lowercasesansserifitalic", + "lowercasesansserifnormal", + "lowercasescript", + -- + "uppercasenormal", + "uppercaseitalic", + "uppercasebold", + "uppercasebolditalic", + "uppercasegreeknormal", + "uppercasegreekitalic", + "uppercasegreekbold", + "uppercasegreekbolditalic", + "uppercaseboldfraktur", + "uppercasebolditalic", + "uppercaseboldscript", + "uppercasedoublestruck", + "uppercasefraktur", + "uppercasegreeksansserifbold", + "uppercasegreeksansserifbolditalic", + "uppercasemonospace", + "uppercasesansserifbold", + "uppercasesansserifbolditalic", + "uppercasesansserifitalic", + "uppercasesansserifnormal", + "uppercasescript", + -- + "digitsbold", + "digitsdoublestruck", + "digitslatin", + "digitsmonospace", + "digitsnormal", + "digitssansserifbold", + "digitssansserifnormal", + -- + -- We don't do these (one can use all=true) because now we can get + -- more details about what gets italics. + -- + -- "latinextendeda", + -- "latinextendedadditional", + -- "latinextendedb", + -- "latinextendedc", + -- "latinextendedd", + -- "latinextendede", + -- "latinextendedf", + -- "latinextendedg", + -- "latinsupplement", + -- + mathematics.tweaks.subsets.dotless, + } + } + end, + moveintegrals = function(parameters) + return { + tweak = "movelimits", + factor = parameters.factor or 1, + icfactor = parameters.icfactor or 1, + list = mathematics.tweaks.subsets.integrals, + } + end, + wipeitalics = function(parameters) + return { + tweak = "wipeitalics", + all = true, + } + end, + wipeanchors = function(parameters) + return { + -- For upright alphabets, we unset the anchor. This means that accents are placed + -- centered over the character. Should be on top. + tweak = "wipeanchors", + list = { + "digitsbold", + "digitsdoublestruck", + "digitsmonospace", + "digitsnormal", + "digitssansserifbold", + "digitssansserifnormal", + "lowercasebold", + "lowercaseboldfraktur", + "lowercasedoublestruck", + "lowercasefraktur", + "lowercasegreekbold", + "lowercasegreeknormal", + "lowercasegreeksansserifbold", + "lowercasemonospace", + "lowercasenormal", + "lowercasesansserifbold", + "lowercasesansserifnormal", + "uppercasebold", + "uppercaseboldfraktur", + "uppercasedoublestruck", + "uppercasefraktur", + "uppercasegreekbold", + "uppercasegreeknormal", + "uppercasegreeksansserifbold", + "uppercasemonospace", + "uppercasenormal", + "uppercasesansserifbold", + "uppercasesansserifnormal", + }, + } + end, + pagellaradical = function(parameters) + return { + tweak = "tweaks", + feature = "pagellaradical", + list = { + { + tweak = "replacealphabets", + list = { + { + source = { first = 0x0221A }, -- sqrt + filename = "texgyrepagella-math.otf", + inherit = { + RadicalRuleThickness = true, + }, + }, + }, + }, + -- { + -- tweak = "parameters", + -- list = { + -- RadicalRuleThickness = 122.88, -- 60*2048/1000 + -- }, + -- }, + }, + } + end, + }, + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg new file mode 100644 index 00000000000..b69ee0103b4 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/concrete-math.lfg @@ -0,0 +1,119 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "concrete-math", + version = "1.00", + comment = "Goodies that complement concrete math.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + DelimiterPercent = 90, + DelimiterShortfall = 400, + PrimeShiftUp = "1.2*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.2*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "fixprimes", + factor = 0.92, + }, + { + tweak = "fixintegrals", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + }, + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x002F.variants.*"] = { topleft = -0.2, bottomright = -0.2 }, + -- + [0x007D] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7D.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right brace variants + ["0x7D.parts.top"] = { topright = -0.25, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.25 }, -- right brace bottom + [0x0029] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + [0x221A] = { topright = 0.2, bottomright = 0.2 }, -- radical + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, + ["0x221A.parts.top"] = { topright = 0.2, }, + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x00393] = { bottomright = -0.30, }, -- upright Gamma + }, + }, + + { + tweak = "dimensions", + list = { + [0x00393] = { width = 0.875, }, -- upright Gamma + }, + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.075 }, + } + }, + { + tweak = "fixellipses", + }, + { + tweak = "addbars", + advance = 0.6, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "addprimed", + }, + { + tweak = "setoptions", + set = { "ignorekerndimensions" } + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 2, 3, 4 + }, + }, +} + diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg index 608b396f8f7..03f86928812 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg @@ -1,27 +1,182 @@ -local kern_V = { bottomright = { { kern = -250 } } } -local kern_W = kern_W +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets --- Beware of updates in ssty slots! +local integral_variants = { bottomright = -0.20 } +local integral_bottom = { bottomright = -0.25 } return { name = "dejavu-math", version = "1.00", comment = "Goodies that complement dejavu.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { - kerns = { - -- [0x1D449] = kern_V, -- 𝑉 - -- ["1:0x1D449"] = kern_V, -- needed for compact - -- ["2:0x1D449"] = kern_V, -- needed for compact - -- [0x1D44A] = kern_W, -- 𝑊 - -- ["1:0x1D44A"] = kern_W, -- needed for compact - -- ["2:0x1D44A"] = kern_W, -- needed for compact - ["*:0x1D449"] = kern_V, -- 𝑉 - ["*:0x1D44A"] = kern_W, -- 𝑊 + parameters = { + FractionRuleThickness = 60, + AccentTopShiftUp = -25, + FlattenedAccentTopShiftUp = -25, + AccentBaseDepth = 30, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1333 in font + SubscriptShiftDown = 177, -- 277 in font + SuperscriptShiftUp = 428, -- 381 in font + SubscriptShiftDownWithSuperscript = "1.3*SubscriptShiftDown", -- trial and error + PrimeShiftUp = "1.4*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.4*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.106", + }, + presets.braille { }, + { + tweak = "fixprimes", + factor = 0.63, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 1.02 }, + presets.rsfsuprighttoscript { rscale = 1.02 }, + presets.moderntocalligraphic { rscale = 1.02 }, + presets.eulertocalligraphic { rscale = 1.02 }, + presets.xitsarabic { rscale = 1.05 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, -- we need to check this + presets.wipeitalics { }, + -- We don't have italic correction in for instance math italic f which means that + -- we also didn't fix it. Therefore we need at least some reasonable kerns. Using + -- a dimension tweak before the above (e.g. 0.2 italic and 0.8 width) doesn't work + -- because once the advance is set the move is blocked and the ic stil wiped. So, + -- we kern. Actually the upright (ascii) f has italic correction. + { + tweak = "kerns", + list = { + [0x1D453] = { bottomright = -.2 }, + } + }, + -- + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.1, bottomright = -0.1 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x00393] = { bottomright = -0.30, }, -- upright Gamma + -- + ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int + ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint + ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint + ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = .1, vfactor = .65 }, + ["0x221A.variants.*"] = { location = "left", hfactor = .1, vfactor = .6 }, + ["0x221A.variants.1"] = { location = "left", hfactor = .1, vfactor = .65 }, + ["0x221A.variants.2"] = { location = "left", hfactor = .1, vfactor = .65 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = .1, vfactor = 1.1 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. + { + tweak = "dimensions", + list = { + [0x020DB] = { yoffset = 0.015, height = .95, all = true }, -- widedddot : 0x20DB (self) + }, + }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "wipecues", + }, + { + tweak = "addbars", + advance = 0.175, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, }, + bigslots = { + 1, 3, 5, 7 + }, }, } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg new file mode 100644 index 00000000000..812430525d5 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond-math.lfg @@ -0,0 +1,217 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "ebgaramond", + version = "1.00", + comment = "Goodies that complement ebgaramond.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + FractionRuleThickness = 60, + OverbarRuleThickness = 60, + UnderbarRuleThickness = 60, + AccentTopShiftUp = -75, + FlattenedAccentTopShiftUp = -75, + AccentBaseDepth = 75, + DelimiterPercent = 90, + DelimiterShortfall = 400, + SubscriptShiftDown = 200, -- 250 in font + SuperscriptShiftUp = 400, -- 430 in font + SubscriptShiftDownWithSuperscript = "1.25*SubscriptShiftDown", -- trial and error + SubSuperscriptGapMin = 200, -- 250 in font + PrimeShiftUp = "1.2*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.2*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 2019-08-16", + }, + { + tweak = "fixprimes", + factor = 0.73, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.95 }, + presets.rsfsuprighttoscript { rscale = 0.95 }, + presets.moderntocalligraphic { rscale = 0.95 }, + presets.eulertocalligraphic { rscale = 0.95 }, + presets.xitsarabic { rscale = 0.80 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "simplifykerns", + }, + { + tweak = "topanchors", + list = { + [0x1D453] = 0.88, -- italic f + }, + }, + { + tweak = "dimensions", + list = { + [0x1D453] = { width = 1.1 }, -- italic f + }, + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.25, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.25 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants -- angle + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + + [0x51] = { bottomright = 0.25 }, -- Upright Q + [0x211A] = { bottomright = 0.2 }, -- Blackboard bold Q + [0x1D410] = { bottomright = 0.2 }, -- Bold Q + [0x1D478] = { bottomright = 0.05 }, -- Bold Q + [0x1D5B0] = { bottomright = 0.05 }, -- Sans Q + }, + }, + { + -- to be considered + -- tweak = "kernpairs", + list = { + [mathematics.tweaks.subsets.gjqy] = { + [mathematics.tweaks.subsets.f] = -.1, + [0x1D70C] = -.1, -- italic \rho + }, + [mathematics.tweaks.subsets.bhklt] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.d] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.f] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + [mathematics.tweaks.subsets.gjqy] = -.25, + [mathematics.tweaks.subsets.bhklt] = -.1, + [mathematics.tweaks.subsets.d] = -.25, + [mathematics.tweaks.subsets.i] = -.25, + [mathematics.tweaks.subsets.mw] = -.25, + [mathematics.tweaks.subsets.p] = -.25, + [mathematics.tweaks.subsets.acenorsuvxz] = -.25, + [mathematics.tweaks.subsets.dotless] = -.25, + }, + [mathematics.tweaks.subsets.i] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.mw] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.p] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.acenorsuvxz] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + [mathematics.tweaks.subsets.dotless] = { + [mathematics.tweaks.subsets.f] = -.25, + [0x1D70C] = -.25, -- italic \rho + }, + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.0 }, + } + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. None in ebgaramond. + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. None in ebgaramond + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.6, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "addprimed", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + { + tweak = "diagnose", + }, + }, + }, + alternates = { + partial = { feature = 'ss02', value = 1, comment = "Curved partial" }, + semibold = { feature = 'ss04', value = 1, comment = "Semibold" }, + extrabold = { feature = 'ss05', value = 1, comment = "Extrabold" }, + hbar = { feature = 'ss06', value = 1, comment = "Horizontal bar for h-bar" }, + integral = { feature = 'ss07', value = 1, comment = "A more slanted integral sign" }, + tilde = { feature = 'ss09', value = 1, comment = "A tilde variant" }, + outbendingh = { feature = 'ss10', value = 1, comment = "Out-bending h" }, + largeoperators = { feature = 'ss11', value = 1, comment = "Larger operators" }, + }, + bigslots = { + 1, 3, 5, 7 + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond.lfg deleted file mode 100644 index 43cc13c51c6..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkiv/ebgaramond.lfg +++ /dev/null @@ -1,53 +0,0 @@ -return { - name = "eb garamond", - version = "1.00", - comment = "Goodies that complement eb garamond.", - author = "Hans Hagen", - copyright = "ConTeXt development team", - designsizes = { - ["EBGaramond-Italic"] = { - ["8pt"] = "file:EBGaramond08-Italic", - ["9pt"] = "file:EBGaramond08-Italic", - ["9.5pt"] = "file:EBGaramond08-Italic", - ["10pt"] = "file:EBGaramond12-Italic", - ["11pt"] = "file:EBGaramond12-Italic", - ["12pt"] = "file:EBGaramond12-Italic", - default = "file:EBGaramond12-Italic", - }, - ["EBGaramond-Regular"] = { - ["8pt"] = "file:EBGaramond08-Regular", - ["9pt"] = "file:EBGaramond08-Regular", - ["9.5pt"] = "file:EBGaramond08-Regular", - ["10pt"] = "file:EBGaramond12-Regular", - ["11pt"] = "file:EBGaramond12-Regular", - ["12pt"] = "file:EBGaramond12-Regular", - default = "file:EBGaramond12-Regular", - }, - ["EBGaramond-SC"] = { - ["8pt"] = "file:EBGaramond08-SC", - ["9pt"] = "file:EBGaramond08-SC", - ["9.5pt"] = "file:EBGaramond08-SC", - ["10pt"] = "file:EBGaramond12-SC", - ["11pt"] = "file:EBGaramond12-SC", - ["12pt"] = "file:EBGaramond12-SC", - default = "file:EBGaramond12-SC", - }, - ["EBGaramond-Bold"] = { - default = "file:EBGaramond12-Bold", - }, - ["EBGaramond-AllSC"] = { - default = "file:EBGaramond12-AllSC", - }, - ["EBGaramond-Initials"] = { - default = "file:EBGaramondInitials", - }, - ["EBGaramond-InitialsF1"] = { - default = "file:EBGaramondInitialsF1", - }, - ["EBGaramond-InitialsF2"] = { - default = "file:EBGaramondInitialsF2", - }, - } -} - - diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg new file mode 100644 index 00000000000..54cc687fab6 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/erewhon-math.lfg @@ -0,0 +1,116 @@ +-- This font is under active development so we don't want to tweek it too much +-- before all issues are sorted out. + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "erewhon-math", + version = "1.00", + comment = "Goodies that complement erewhon math.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + AccentBaseDepth = 60, + DelimiterPercent = 90, + DelimiterShortfall = 400, + SubscriptShiftDown = 200, -- 220 in font + SuperscriptShiftUp = 400, -- 400 in font + SubscriptShiftDownWithSuperscript = "1.2*SubscriptShiftDown", -- unclear original value, trial and error + PrimeShiftUp = "1.1*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.1*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "fixprimes", + factor = 0.94 , + fake = 0.85, -- replace multiples with this width proportion + }, + { + tweak = "addmirrors", + }, + { + tweak = "dimensions", + list = { + ["0x222B.variants.*"] = { axis = .15 }, + }, + }, + { + tweak = "fixintegrals", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.90 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.15, bottomright = -0.15 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.1, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.1 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.1, bottomright = -0.1 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x00393] = { bottomright = -0.3 }, -- upright Gamma + }, + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = .1, vfactor = 1.025 }, + } + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "addprimed", + }, + { + tweak = "setoptions", + }, + }, + }, + bigslots = { + 1, 2, 3, 4 + }, + }, + +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg index da7647c5339..1c4659786fa 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/euler-math.lfg @@ -1,4 +1,5 @@ --- this file might go away and is for experiments only +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets return { name = "euler-math", @@ -7,17 +8,120 @@ return { author = "Hans Hagen", copyright = "ConTeXt development team", mathematics = { - -- virtuals = { - -- ["euler-nova"] = { - -- { name = "texgyrepagella-math.otf", main = true, parameters = true }, - -- { name = "euler.otf", overlay = true }, -- first = 0x1234, last = 0x1256 - -- - -- -- { name = "euler.otf", main = true, parameters = true }, - -- -- { name = "texgyrepagella-math.otf", overlay = true }, - -- - -- }, - -- } - } -} - + parameters = { + -- DelimiterPercent = 90, + -- DelimiterShortfall = 500, + -- taken from pagella: + NoLimitSupFactor = 0, + NoLimitSubFactor = 900, + AccentTopShiftUp = 10, + FlattenedAccentTopShiftUp = 10, + -- AccentExtendMargin = 50, + -- AccentBaseHeight = 0, + AccentBaseDepth = 80, + -- SpaceAfterScript = 0, + -- SpaceAfterScript = 30, + RadicalDegreeBottomRaisePercent = 60, + RadicalKernAfterDegree = -500, + RadicalRuleThickness = 60, -- 60 in font + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1500 in font + PrimeRaisePercent = 75, -- 50 default + PrimeRaiseComposedPercent = 10, -- 25 default + -- RadicalKernAfterExtensible = 0, -- 0 default + -- RadicalKernBeforeExtensible = 0, -- 0 default + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 000.002 ", + }, + { + tweak = "fixprimes", + factor = 1.2, + smaller = true, + scale = 0.80, + fake = 0.80, + }, + { + tweak = "replacealphabets", + feature = "pagellaovereuler", + filename = "texgyrepagella-math.otf", + list = { + -- { source = { first = 0x02100, last = 0x0210D } }, -- no 0x2210E + -- { source = { first = 0x0210F, last = 0x02BFF } }, + { source = { first = 0x02100, last = 0x02BFF } }, + { source = { first = 0x1D400, last = 0x1D7FF } }, + { source = { first = 0x1D538, last = 0x1D550 } }, + }, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 1 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { }, + presets.wipeitalics { }, + { + tweak = "fixoldschool", + }, + -- add the accent fixes + -- fixslashes? + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "addprivates", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addarrows", + }, + { + tweak = "addbars", + advance = 0.2, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 3, 5, 7 + }, + alternates = { + dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg new file mode 100644 index 00000000000..2a55504da53 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/generic-math.lfg @@ -0,0 +1,257 @@ +-- We will add a few more examplex to this file. + +return { + name = "generic-math", + version = "1.00", + comment = "A starting point.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + NoLimitSupFactor = 0, + NoLimitSubFactor = 900, + AccentBaseDepth = 150, + PrimeRaisePercent = 25, + PrimeShiftUp = "SuperscriptShiftUp", + PrimeBaselineDropMax = "SuperscriptBaselineDropMax", + PrimeShiftUpCramped = "SuperscriptShiftUpCramped", + PrimeSpaceAfter = 0, + PrimeWidthPercent = 50, + SpaceBeforeScript = "SpaceAfterScript", + NoLimitSupFactor = 0, + NoLimitSubFactor = 0, + AccentTopShiftUp = 0, + AccentBottomShiftDown = 0, + AccentBaseDepth = 0, + AccentFlattenedBaseDepth = 0, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- XXXX in font + }, + tweaks = { + aftercopying = { + { + tweak = "dimensions", + list = { + -- whatever + }, + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 1 }, + presets.rsfsuprighttoscript { rscale = 1 }, + presets.moderntocalligraphic { rscale = 1 }, + presets.eulertocalligraphic { rscale = 1 }, + presets.xitsarabic { rscale = 1 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, -- we need to check the 1.5 + presets.wipeanchors { }, + presets.wipeitalics { }, + { + tweak = "simplifykerns", + }, + presets.moveitalics { + correct = true + }, { + tweak = "fixprimes", + factor = 0.85, -- accent base height + smaller = true, -- replace multiples + scale = 0.75, -- glyph scale + fake = 0.75, -- replace multiples with this width proportion + -- keep = true, -- keep the text size prime (aka minute) + }, + { + tweak = "fixslashes", + }, + { + tweak = "fixellipses", + }, + { + tweak = "addbreve", + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + list = { "over", "under" }, + -- list = { + -- [0x203E] = { factor = "over" }, -- overbar + -- [0x203E] = { factor = "under" }, -- underbar + -- [0x23DE] = { factor = "over" }, -- overbrace + -- [0x23DF] = { factor = "under" }, -- underbrace + -- [0x23DC] = { factor = "over" }, -- overparent + -- [0x23DD] = { factor = "under" }, -- underparent + -- [0x23B4] = { factor = "over" }, -- overbracket + -- [0x23B5] = { factor = "under" }, -- underbracket + -- } + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addarrows", + left = 0.1, + right = 0.1, + slack = 0.20, + list = { + [0x21A9] = false, + [0x21AA] = false, + [0x2190] = false, + [0x2192] = false, + [0x219E] = false, + [0x21A0] = false, +-- [0x21A6] = false, +-- [0x21CB] = false, +-- [0x21CC] = false, + } + }, +-- { +-- tweak = "limits", +-- factor = 1.5, +-- list = { +-- [0x0222B] = true, +-- [0x0222C] = 1.45, +-- [0x0222D] = true, +-- [0x0222E] = true, +-- [0x0222F] = true, +-- }, +-- }, + { + -- For upright alphabets, we unset the anchor. + -- This means that accents are placed + -- centered over the character + tweak = "wipeanchors", + -- list = { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 }, -- todo: ranges + list = { + "digitsbold", + "digitsdoublestruck", + "digitsmonospace", + "digitsnormal", + "digitssansserifbold", + "digitssansserifnormal", + "lowercasebold", + "lowercaseboldfraktur", + "lowercasedoublestruck", + "lowercasefraktur", + "lowercasegreekbold", + "lowercasegreeknormal", + "lowercasegreeksansserifbold", + "lowercasemonospace", + "lowercasenormal", + "lowercasesansserifbold", + "lowercasesansserifnormal", + "uppercasebold", + "uppercaseboldfraktur", + "uppercasedoublestruck", + "uppercasefraktur", + "uppercasegreekbold", + "uppercasegreeknormal", + "uppercasegreeksansserifbold", + "uppercasemonospace", + "uppercasenormal", -- they are italic! + "uppercasesansserifbold", + "uppercasesansserifnormal", + }, + }, + { + -- For non-italic alphabets we + -- remove italic correction. + tweak = "wipeitalics", + list = { + -- "digitsbold", + -- "digitsdoublestruck", + -- "digitsmonospace", + -- "digitsnormal", + -- "digitssansserifbold", + -- "digitssansserifnormal", + -- "lowercasebold", + -- "lowercaseboldfraktur", + -- "lowercasedoublestruck", + -- "lowercasefraktur", + "lowercasemonospace", + "lowercasenormal", + -- "lowercasesansserifbold", + -- "lowercasesansserifnormal", + -- "lowercasegreeknormal", + "uppercasebold", + -- "uppercaseboldfraktur", + -- "uppercasedoublestruck", + -- "uppercasefraktur", + -- "uppercasegreekbold", + -- "uppercasegreeknormal", + -- "uppercasegreeksansserifbold", + "uppercasemonospace", + "uppercasesansserifbold", + "uppercasesanserifnormal", + }, + }, + -- { + -- comment = "example" + -- tweak = "action", + -- action = function(target,original,parameters) mathematics.tweaks.fixdimensions(target, original, parameters) + -- list = fixes, -- one of the parameters + -- }, + -- { + -- comment = "example" + -- tweak = "action", + -- action = mathematics.tweaks.fixdimensions, + -- list = fixes, -- one of the parameters + -- }, + { + -- This one fakes margins to get larger/smaller accents + -- with for example \widetilde. + -- see lm for many examples + tweak = "margins", + list = { + }, + }, + -- { + -- tweak = "fixanchors", + -- factor = .5, + -- }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.1, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "wipecues", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 2, 3, 4 + }, + alternates = { + -- italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg index f2fb6934154..815b9e1207b 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/iwona-math.lfg @@ -1,5 +1,33 @@ -local msam = { name = "msam10.tfm", vector = "tex-ma" } -local msbm = { name = "msbm10.tfm", vector = "tex-mb" } +local common = fonts.goodies.load("common-math-jmn.lfg") +local helpers = common.mathematics.helpers + +local badones = { + summationtext = .25, + producttext = .25, + integraltext = .25, + uniontext = .25, + intersectiontext = .25, + unionmultitext = .25, + logicalandtext = .25, + logicalortext = .25, + summationdisplay = .25, + productdisplay = .25, + integraldisplay = .25, + uniondisplay = .25, + intersectiondisplay = .25, + unionmultidisplay = .25, + logicalanddisplay = .25, + logicalordisplay = .25, + coproducttext = .25, + coproductdisplay = .25, +} + +local uglyones = { + -- braceleft = true, + -- braceright = true, + vextendsingle = true, + vextenddouble = true, +} return { name = "iwona-math", @@ -13,45 +41,54 @@ return { "iwona-mi.map", "iwona-sy.map", "iwona-ex.map", - "mkiv-base.map", + -- "mkiv-base.map", }, virtuals = { ["iwona-math"] = { - { name = "file:Iwona-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona", main = true, parameters = false }, + -- + { name = "rm-iwonar.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonari.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonari.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonar.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonami.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonam.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonar.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, ["iwona-light-math"] = { - { name = "file:IwonaLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-light", main = true, parameters = false }, + -- + { name = "rm-iwonal.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonali.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonali.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonal.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonari.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonar.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonal.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, ["iwona-medium-math"] = { - { name = "file:IwonaMedium-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-medium", main = true, parameters = false }, + -- + { name = "rm-iwonam.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonami.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonami.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonam.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonabi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonab.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonam.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, ["iwona-heavy-math"] = { - { name = "file:IwonaHeavy-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-heavy", main = true, parameters = false }, + -- + { name = "rm-iwonah.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonahi.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonahi.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonah.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonahi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonah.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonah.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, } - } + }, + addmissing = helpers.addmissing, } } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg new file mode 100644 index 00000000000..74bf2dd4966 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/koeielettersot.lfg @@ -0,0 +1,16 @@ +return { + name = "koeielettersot", + version = "1.00", + comment = "Goodies that complement koeielettersot", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + rules = { + ["radical.extender"] = "radical.extender", + ["radical.end"] = "radical.end", + ["hrule.begin"] = "rule.begin", + ["hrule.extender"] = "rule.ex", + ["hrule.end"] = "rule.end", + } + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg new file mode 100644 index 00000000000..409b17cbc42 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/kpfonts-math.lfg @@ -0,0 +1,146 @@ +-- This font is under active development so we don't want to tweek it too much +-- before all issues are sorted out. + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "kpfonts-math", + version = "1.00", + comment = "KP Fonts.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + AccentBaseDepth = 30, + DelimiterPercent = 90, + DelimiterShortfall = 400, + PrimeShiftUp = "1.15*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.15*SuperscriptShiftUp", + SubscriptShiftDownWithSuperscript = "1.2*SubscriptShiftDown", -- unclear original value, trial and error + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 0.40", + }, + { + tweak = "dimensions", + list = { + [0x2A3F] = { factor = 0.84625 } + }, + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.25 }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.25 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.1, bottomright = -0.1 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.05 }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.05 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2 }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + + }, + }, + { + tweak = "fixprimes", + factor = 0.86, -- accent base height + smaller = true, -- replace multiples + scale = 1, -- glyph scale + fake = 0.8, -- replace multiples with this width proportion + }, + { + tweak = "addmirrors", + }, + { + -- kpfonts have calligraphic at private slots + tweak = "replacealphabets", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + }, + { + source = { first = 0x0E7E1, last = 0x0E7FA }, + target = "uppercasecalligraphic", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + }, + { + source = { first = 0x0E701, last = 0x0E71A }, + target = "uppercaseboldcalligraphic", + }, + }, + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.95 }, + presets.rsfsuprighttoscript { rscale = 0.95 }, + presets.moderntocalligraphic { rscale = 0.95 }, + presets.eulertocalligraphic { rscale = 0.95 }, + presets.xitsarabic { rscale = 0.92 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.4 }, + presets.wipeitalics { }, + { + tweak = "checkspacing", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = .0, vfactor = .75 }, + ["0x221A.variants.*"] = { location = "left", hfactor = .0, vfactor = .55 }, + ["0x221A.variants.1"] = { location = "left", hfactor = .0, vfactor = .6 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 0.65 }, + } + }, + + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + -- This will be fixed. Check if new version comes out! + tweak = "addbars", + advance = 0.5, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "addprimed", + }, + { + tweak = "setoptions", + set = { "ignorekerndimensions" } + }, + }, + }, + alternates = { + -- italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + }, + bigslots = { + 1, 2, 3, 4 + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg new file mode 100644 index 00000000000..22199251855 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/kurier-math.lfg @@ -0,0 +1,94 @@ +local common = fonts.goodies.load("common-math-jmn.lfg") +local helpers = common.mathematics.helpers + +local badones = { + summationtext = .25, + producttext = .25, + integraltext = .25, + uniontext = .25, + intersectiontext = .25, + unionmultitext = .25, + logicalandtext = .25, + logicalortext = .25, + summationdisplay = .25, + productdisplay = .25, + integraldisplay = .25, + uniondisplay = .25, + intersectiondisplay = .25, + unionmultidisplay = .25, + logicalanddisplay = .25, + logicalordisplay = .25, + coproducttext = .25, + coproductdisplay = .25, +} + +local uglyones = { + -- braceleft = true, + -- braceright = true, + vextendsingle = true, + vextenddouble = true, +} + +return { + name = "kurier-math", + version = "1.00", + comment = "Goodies that complement kurier math.", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + mapfiles = { + "kurier-rm.map", + "kurier-mi.map", + "kurier-sy.map", + "kurier-ex.map", + -- "mkiv-base.map", + }, + virtuals = { + ["kurier-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier", main = true, parameters = false }, + -- + { name = "rm-kurierr.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierm.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierr.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, + }, + ["kurier-light-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-light", main = true, parameters = false }, + -- + { name = "rm-kurierl.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierli.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierli.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, + }, + ["kurier-medium-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-medium", main = true, parameters = false }, + -- + { name = "rm-kurierm.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierh.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kuriermz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierm.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, + }, + ["kurier-heavy-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-heavy", main = true, parameters = false }, + -- + { name = "rm-kurierh.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierh.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierhz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierh.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, + } + }, + addmissing = helpers.addmissing, + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg new file mode 100644 index 00000000000..6f707ed2b8f --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/libertinus-math.lfg @@ -0,0 +1,171 @@ +-- Well, here we have yet another math font that does things differently: a huge prime in the ssty1 +-- slot (not an alternate but a single) and a small one in the normal location. Actually, only primes +-- have an ssty feature. Now, because we have some magic with primes in ConTeXt we cannot use some +-- fix-feature or just disable ssty, but we have to revert to a runtime fix. Lucky me that I didn't +-- remove that hardly needed 'tweaks' mechanism yet. + + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "libertinus-math", + version = "1.00", + comment = "Goodies that complement libertinus.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + FractionRuleThickness = 50, + OverbarRuleThickness = 50, + UnderbarRuleThickness = 50, + AccentTopShiftUp = -35, + FlattenedAccentTopShiftUp = -35, + AccentBaseDepth = 10, + DelimiterPercent = 90, + DelimiterShortfall = 400, + PrimeShiftUp = "1.2*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.2*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 7.040", + }, + { + tweak = "addmirrors", + }, + -- we have a weird middle integral piece + { + tweak = "dimensions", + list = { + [0x23AE] = { xoffset = -.19 }, + }, + }, + { + tweak = "fixintegrals", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.97 }, + presets.rsfsuprighttoscript { rscale = 0.97 }, + presets.moderntocalligraphic { rscale = 0.97 }, + presets.eulertocalligraphic { rscale = 0.97 }, + presets.xitsarabic { rscale = 0.85 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "simplifykerns", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.15, bottomright = -0.15 }, + ["0x7D.parts.top"] = { topright = -0.2, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.2 }, -- right brace bottom + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x00393] = { bottomright = -0.30, }, -- upright Gamma + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.8, anchor = 1.40, xoffset = .20 }, -- widehat + [0x00303] = { width = 2.0, anchor = 1.50, xoffset = .30 }, -- widetilde + [0x00306] = { width = 1.6, anchor = 1.30, xoffset = .15 }, -- widebreve + [0x0030C] = { width = 1.3, anchor = 1.15, xoffset = .075 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. None in libertinus. + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = .0, vfactor = .625 }, + ["0x221A.variants.*"] = { location = "left", hfactor = .0, vfactor = .5 }, + ["0x221A.variants.1"] = { location = "left", hfactor = .0, vfactor = .55 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.15 }, + } + }, + { + tweak = "fixprimes", + factor = 0.92, + fake = 0.75, + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.5, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + -- needed for integrals (bad axis) and (less prominent) fences + tweak = "setoptions", + set = { "ignorekerndimensions" } + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 3, 5, 7 + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lm-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lm-math.lfg index a0fd2c21c57..2f5a69e3643 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/lm-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lm-math.lfg @@ -235,6 +235,10 @@ return { author = "Hans Hagen", copyright = "ConTeXt development team", mathematics = { + parameters = { + NoLimitSupFactor = 0, + NoLimitSubFactor = 900, + }, mapfiles = { "lm-math.map", "lm-rm.map", @@ -253,11 +257,5 @@ return { variables = { joinrelfactor = 3, -- default anyway }, - parameters = { -- test values - -- FactorA = 123.456, - -- FactorB = false, - -- FactorC = function(value,target,original) return 7.89 * target.factor end, - -- FactorD = "Hi There!", - }, } } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lm.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lm.lfg index ec37a2975a4..13023214a97 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/lm.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lm.lfg @@ -1,81 +1,22 @@ -- In order to be able to use beta math fonts, we use our own file name and --- always remap. - -local kern_150 = { bottomright = { { kern = -150 } } } -local kern_200 = { bottomright = { { kern = -200 } } } +-- always remap (as there is no development we no longer do this). return { name = "latin modern", version = "1.00", comment = "Goodies that complement latin modern.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", - mathematics = { - tweaks = { - aftercopying = { - mathematics.tweaks.fixbadprime, -- prime is too low - -- mathematics.tweaks.fixoverline, - }, - }, - kerns = { - [0x1D449] = kern_150, -- - [0x1D44A] = kern_200, -- 𝑊 - }, - dimensions = { - -- always applied - -- default = { - -- }, - -- driven by 'mathdimensions' feature - default = { - -- the root is quite displaced - [0x221A] = { - -- 73, -960, 853, 40 - yoffset = 960 - 40, - height = 960, - depth = 40, - }, - -- [0xFE932] = { xoffset = 50, width = 290 }, -- used prime - -- [0x2032] = { xoffset = 50, width = 290 }, -- prime - }, - signs = { - -- set dimensions - -- [0x00B1] = { -- ± - -- height = 500, depth = 0, - -- }, - -- [0x2213] = { -- ∓ - -- height = 500, depth = 0, - -- }, - -- move in boundingbox - [0x00B1] = { -- ± - yoffset = 100, - }, - [0x2213] = { -- ∓ - yoffset = -100, - }, - }, - }, --- parameters = { --- FractionNumeratorDisplayStyleShiftUp = function(value,target,original) --- local o = original.mathparameters.FractionNumeratorDisplayStyleShiftUp --- if o > 675 then --- o = 600 --- else --- -- probably tuned --- end --- return o * target.parameters.factor --- end, --- } - }, - filenames = { - ["latinmodern-math-regular.otf"] = { - "latinmodern-math.otf", -- the beta - "lmmath-regular.otf", - "latinmodernmath-regular.otf", - "lmmath-regular.otf", - "lmodernmath-regular.otf", - "lmodern-math.otf", - }, - }, + -- filenames = { + -- ["latinmodern-math-regular.otf"] = { + -- "latinmodern-math.otf", -- the beta + -- "lmmath-regular.otf", + -- "latinmodernmath-regular.otf", + -- "lmmath-regular.otf", + -- "lmodernmath-regular.otf", + -- "lmodern-math.otf", + -- }, + -- }, designsizes = { ["LMMathRoman-Regular"] = { ["4pt"] = "LMMath5-Regular@lmroman5-math", @@ -262,3 +203,4 @@ return { }, } } + diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg new file mode 100644 index 00000000000..64f53dc33f8 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-math.lfg @@ -0,0 +1,225 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +local integral_variants = { bottomright = -0.20 } +----- integral_top = { topright = 0.05 } +local integral_bottom = { bottomright = -0.45 } + +return { + name = "lucida-opentype-math", + version = "1.00", + comment = "Goodies that complement lucida opentype.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + FractionRuleThickness = 55, + AccentBaseDepth = 250, + DelimiterPercent = 90, + DelimiterShortfall = 400, + SuperscriptBottomMaxWithSubscript = 325, + PrimeShiftUp = "1.4*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.4*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.901", + }, + { + tweak = "fixoldschool", + version = "Version 1.802", + }, +{ + tweak = "parameters", + feature = "boldmath", + list = { +-- RadicalRuleThickness = 55, + RadicalRuleThickness = 60, +-- RadicalRuleThickness = "1.09*RadicalRuleThickness", +-- FractionRuleThickness = 65, +-- OverRuleThickness = 65, +-- UnderRuleThickness = 65, + } +}, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 1 }, + presets.rsfsuprighttoscript { rscale = 1 }, + presets.moderntocalligraphic { rscale = 1 }, + presets.eulertocalligraphic { rscale = 1 }, + presets.xitsarabic { rscale = 1.05 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "replacealphabets", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + feature = "ss04", + }, + { + source = "lowercasescript", + target = "lowercasecalligraphic", + feature = "ss04", + }, + { + source = "uppercaseboldscript", + target = "uppercaseboldcalligraphic", + feature = "ss04", + }, + -- No lowercase bold calligraphic/script in font + }, + }, + { + tweak = "dimensions", + version = "Version 1.802", + list = { + -- The < and > are slightly too small. We scale them by 867/795 + ["0x003C"] = { scale = 1.09057, width = 1.09057, height = 1.09057 }, + ["0x003E"] = { scale = 1.09057, width = 1.09057, height = 1.09057 }, + }, + }, + { + tweak = "dimensions", + version = "Version 1.802", + list = { + -- these we fix here. Remove when we have new version of Lucida + ["0x23DC.parts.1"] = { xoffset = -0.075, height = .4, yoffset = -0.6 }, + ["0x23DC.parts.2"] = { height = .4, yoffset = -0.6 }, + ["0x23DC.parts.3"] = { xoffset = 0.075, height = .4, yoffset = -0.6 }, + ["0x23DD.parts.1"] = { xoffset = -0.075, depth = .8, yoffset = 0.2 }, + ["0x23DD.parts.2"] = { depth = .8, yoffset = 0.2 }, + ["0x23DD.parts.3"] = { xoffset = 0.075, depth = .8, yoffset = 0.2 }, + ["0x7C.variants.3"] = { squeeze = 0.90, height = 0.90, depth = 0.90 }, + ["0x7C.variants.4"] = { squeeze = 0.80, height = 0.80, depth = 0.80 }, + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.variants.3"] = { location = "left", hfactor = 0, vfactor = .55 }, + ["0x221A.variants.4"] = { location = "left", hfactor = 0, vfactor = .50 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0, vfactor = .85 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. Not in lucida + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. Not in lucida. + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "fixslashes", + }, + { + tweak = "addbreve", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15 }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.25 }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.25 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2 }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.2, bottomright = -0.2 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.2, bottomright = -0.2 }, + ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + }, + }, + { + tweak = "fixprimes", + factor = 0.7, -- accent base height + fake = 0.65, -- replace multiples with this width proportion + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addactuarian", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + tweak = "addarrows", + left = 0.1, + right = 0.1, + slack = 0.20, + list = { + [0x21A9] = false, + [0x21AA] = false, + [0x2190] = false, + [0x2192] = false, + [0x219E] = false, + [0x21A0] = false, + } + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + alternates = { + textitalic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + arrow = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, + operator = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Smaller Operators" }, + calligraphic = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, + zero = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" }, + multipledots = { feature = 'ss06', value = 1, comment = "Mathematical Alternative Multiple Dots" }, + ldots = { feature = 'ss07', value = 1, comment = "Mathematical Alternative Ellipsis" }, + }, + bigslots = { + 1, 2, 3, 4 + }, + -- + -- experimental fixes for mkiv: + -- + dimensions = dimensions, + kerns = kerns, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-opentype-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/lucida-opentype-math.lfg deleted file mode 100644 index 7596f139add..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkiv/lucida-opentype-math.lfg +++ /dev/null @@ -1,51 +0,0 @@ ------ kern_250 = { bottomright = { { kern = -250 } }, force = true } - --- RadicalVerticalGap = 50 --- RadicalDisplayStyleVerticalGap = 175 - --- RadicalVerticalGap = 166 --- RadicalDisplayStyleVerticalGap = 345 - -local function FixRadicalDisplayStyleVerticalGap(value,target,original) - local o = original.mathparameters.RadicalVerticalGap -- 50 - return 2 * o * target.parameters.factor -end - -return { - name = "lucida-opentype-math", - version = "1.00", - comment = "Goodies that complement lucida opentype.", - author = "Hans Hagen", - copyright = "ConTeXt development team", - mathematics = { - parameters = { - RadicalDisplayStyleVerticalGap = FixRadicalDisplayStyleVerticalGap, - }, - alternates = { - italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, - arrow = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, - operator = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Smaller Operators" }, - calligraphic = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, - zero = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" }, - partial = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Upright Partial Differential" }, - }, - -- kerns = { - -- [0x1D449] = kern_250, -- - -- [0x1D44A] = kern_250, -- 𝑊 - -- }, - dimensions = { - default = { -- experimental values - [0x02044] = { xoffset = 275, width = 600 }, - -- primes - [0xFE932] = { width = 200 }, - [0xFE933] = { width = 500 }, - [0xFE934] = { width = 800 }, - [0xFE935] = { width = 1100 }, - -- reverse primes - [0xFE935] = { width = 200 }, - [0xFE936] = { width = 500 }, - [0xFE937] = { width = 800 }, - }, - }, - }, -} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg index 863836c1cc0..ab58d0dc6f2 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg @@ -1,11 +1,15 @@ -local kern_W = { bottomright = { { kern = -150 } } } -local kern_V = { bottomright = { { kern = -200 } } } +-- This math font has not yet been set up. We will only do that when those involved +-- ConTeXt (math) develoipment have official copies of all the text minion and math +-- fonts without restrictions of usage in documents. + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets return { name = "minion-math", version = "1.00", comment = "Goodies that complement minion math.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", designsizes = { ["Minion-Math"] = { @@ -21,10 +25,100 @@ return { }, }, mathematics = { - kerns = { - [0x1D449] = kern_V, -- 𝑉 - [0x1D44A] = kern_W, -- 𝑊 - -- todo: ssty 1/2 + parameters = { + SubscriptShiftDown = 200, -- 250 in font + SubscriptShiftDownWithSuperscript = "1.40*SubscriptShiftDown", -- 1.5* in math-act + PrimeShiftUp = "1.15*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.15*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + -- { + -- tweak = "version", + -- expected = "unknown", -- todo + -- }, + { + tweak = "addmirrors", + }, + presets.rsfstoscript { rscale = 0.97 }, + presets.rsfsuprighttoscript { rscale = 0.97 }, + presets.moderntocalligraphic { rscale = 0.97 }, + presets.eulertocalligraphic { rscale = 0.97 }, + presets.xitsarabic { rscale = 0.88 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.3 }, + presets.wipeitalics { }, + + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x002F.variants.*"] = { topleft = -0.2, bottomright = -0.2 }, + -- + [0x007D] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x7D.variants.*"] = { topright = -0.10, bottomright = -0.10 }, -- right brace variants + ["0x7D.parts.top"] = { topright = -0.10, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.10 }, -- right brace bottom + [0x0029] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x29.parts.top"] = { topright = -0.15, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.15 }, -- right parenthesis bottom + [0x221A] = { topright = 0.2, bottomright = 0.2 }, -- radical + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, + ["0x221A.parts.top"] = { topright = 0.2, }, + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- Keep as example. not needed in cambria (after all it is the reference): + [0x2A0C] = { bottomright = -0.1 }, -- iiiint does not have any ic + }, + }, + { + tweak = "simplifykerns", + }, + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = -0.15, vfactor = .75 }, + ["0x221A.variants.*"] = { location = "left", hfactor = -0.1, vfactor = .575 }, + ["0x221A.variants.1"] = { location = "left", hfactor = -0.1, vfactor = .725 }, + ["0x221A.variants.2"] = { location = "left", hfactor = -0.1, vfactor = .65 }, + ["0x221A.variants.3"] = { location = "left", hfactor = -0.1, vfactor = .625 }, + ["0x221A.variants.4"] = { location = "left", hfactor = -0.1, vfactor = .625 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = -0.1, vfactor = 0.85 }, + } + }, + { + tweak = "fixaccents", + }, + { + tweak = "copyaccents", + }, + { + tweak = "fixprimes", + factor = 1, + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, }, }, } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg new file mode 100644 index 00000000000..4af740789f5 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/modern-math.lfg @@ -0,0 +1,355 @@ +-- In order to be able to use beta math fonts, we use our own file name and +-- always remap. + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "latin modern math", + version = "1.00", + comment = "Goodies that complement latin modern math.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + FractionNumeratorDisplayStyleShiftUp = 600, -- used to be a function + AccentTopShiftUp = -60, + FlattenedAccentTopShiftUp = -60, + AccentSuperscriptDrop = 100, -- drop the superscripts if accents are present. Amount in percentage of height of accent(?) + AccentSuperscriptPercent = 0, + DelimiterPercent = 90, + DelimiterShortfall = 400, + SubscriptShiftDown = 150, -- 247 in font (multiplied to be consistent with cm) + SubscriptShiftDownWithSuperscript = 247, -- relates to the previous one (see math-act) + -- SubscriptTopMax = 344, -- 344 in font .8 exheight + -- SuperscriptBaselineDropMax = 386, -- 250 in font (multiplied by 4.6333/2.99 (values in cm/values in lm)) 0 means: align the baseline of the superscript at the (top) + SuperscriptBaselineDropMax = 0.6*431, -- 250 in font (multiplied by 4.6333/2.99 (values in cm/values in lm)) + SubscriptBaselineDropMin = 0.1*431, -- 200 in font + -- SuperscriptBottomMaxWithSubscript = 344, -- 344 in font .8 exheight + -- SuperscriptBottomMin = 108, -- 108 in font .25 exheight + SuperscriptShiftUp = 413, -- 363 in font (multiplied with 4.9547/4.3536, got 413) + SuperscriptShiftUpCramped = 413, -- 289 in font (no distinction, old TeX) + PrimeShiftUp = "1.1*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.1*SuperscriptShiftUp", + -- PrimeRaisePercent = 0, -- set to 0 in math-act + -- PrimeRaiseComposedPercent = 0, -- set to 0 in math-act + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.958", + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.80 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.4, icfactor = 0.8 }, -- the icfactor is due to the very slanted integral. + presets.wipeanchors { }, + presets.wipeitalics { }, + { + tweak = "dimensions", + list = { + [0x1D487] = { anchor = 0.9 }, -- bold italic f + [0x1D489] = { anchor = 1.2 }, -- bold italic h + [0x1D48C] = { anchor = 1.2 }, -- bold italic k + [0x1D48F] = { anchor = 1.1 }, -- bold italic n + [0x1D491] = { anchor = 1.2 }, -- bold italic p + [0x1D492] = { anchor = 0.9 }, -- bold italic q + [0x1D49B] = { anchor = 0.9 }, -- bold italic z + + [0x1D736] = { anchor = 0.9 }, -- bold italic alpha + [0x1D737] = { anchor = 0.9 }, -- bold italic beta + [0x1D738] = { anchor = 1.1 }, -- bold italic gamma + [0x1D740] = { anchor = 1.2 }, -- bold italic lambda + [0x1D744] = { anchor = 1.2 }, -- bold italic omicron + + [0x1D6FE] = { anchor = 1.1 }, -- italic gamma + [0x1D702] = { anchor = 1.1 }, -- italic eta + + [0x1D44F] = { anchor = 1.15 }, -- italic b + [0x1D451] = { anchor = 0.8, }, -- italic d + [0x1D455] = { anchor = 1.15 }, -- italic h + [0x1D458] = { anchor = 1.15 }, -- italic k + [0x1D45B] = { anchor = 1.1 }, -- italic n + [0x1D45D] = { anchor = 1.1 }, -- italic p + [0x1D45E] = { anchor = 0.9 }, -- italic q + [0x1D467] = { anchor = 0.9 }, -- italic z + + [0x1D6FE] = { anchor = 1.2 }, -- italic gamma + [0x1D706] = { anchor = 1.2 }, -- italic lambda + [0x1D70A] = { anchor = 1.1 }, -- italic omikron + [0x1D70D] = { anchor = 1.1 }, -- italic varsigma + + [0x1D46A] = { anchor = 0.75 }, -- bold italic C + [0x1D46B] = { anchor = 1.1 }, -- bold italic D + [0x1D46E] = { anchor = 0.75 }, -- bold italic G + [0x1D479] = { anchor = 1.2 }, -- bold italic R + [0x1D47A] = { anchor = 0.8 }, -- bold italic S + -- uppercaseboldscript could be improved + [0x1D435] = { anchor = 1.05 }, -- italic B + [0x1D436] = { anchor = 0.7 }, -- italic C + [0x1D437] = { anchor = 1.05 }, -- italic D + [0x1D43A] = { anchor = 0.8 }, -- italic G + [0x1D443] = { anchor = 1.1 }, -- italic P + [0x1D445] = { anchor = 1.05 }, -- italic R + [0x1D446] = { anchor = 0.85 }, -- italic S + [0x1D49C] = { anchor = 0.9 }, -- script A + [0x1D49D] = { anchor = 0.95 }, -- script B + [0x1D49E] = { anchor = 0.8 }, -- script C + [0x1D49F] = { anchor = 0.95 }, -- script D + [0x1D4A0] = { anchor = 0.85 }, -- script E + [0x1D4A1] = { anchor = 0.75 }, -- script F + [0x1D4A2] = { anchor = 0.9 }, -- script G + [0x1D4A3] = { anchor = 0.85 }, -- script H + [0x1D4A4] = { anchor = 0.8 }, -- script I + [0x1D4A5] = { anchor = 0.8 }, -- script J + [0x1D4A6] = { anchor = 0.85 }, -- script K + [0x1D4A7] = { anchor = 0.75 }, -- script L + [0x1D4A8] = { anchor = 0.9 }, -- script M + [0x1D4A9] = { anchor = 0.85 }, -- script N + [0x1D4AA] = { anchor = 0.95 }, -- script O + [0x1D4AB] = { anchor = 0.95 }, -- script P + [0x1D4AC] = { anchor = 0.95 }, -- script Q + [0x1D4AD] = { anchor = 0.95 }, -- script R + [0x1D4AE] = { anchor = 0.9 }, -- script S + [0x1D4AF] = { anchor = 0.75 }, -- script T + [0x1D4B0] = { anchor = 0.9, }, -- script U + [0x1D4B1] = { anchor = 0.95 }, -- script V + [0x1D4B2] = { anchor = 0.95 }, -- script W + [0x1D4B3] = { anchor = 0.95 }, -- script X + [0x1D4B4] = { anchor = 0.9 }, -- script Y + [0x1D4B5] = { anchor = 1 }, -- script Z + ["0x7C.variants.1"]={ squeeze = 0.90, height = 0.90, depth = 0.90 }, + ["0x7C.variants.2"]={ squeeze = 0.85, height = 0.85, depth = 0.85 }, + ["0x7C.variants.3"]={ squeeze = 0.80, height = 0.80, depth = 0.80 }, + ["0x7C.variants.4"]={ squeeze = 0.80, height = 0.80, depth = 0.80 }, + ["0x7C.variants.5"]={ squeeze = 0.80, height = 0.80, depth = 0.80 }, + ["0x7C.variants.6"]={ squeeze = 0.80, height = 0.80, depth = 0.80 }, + ["0x7C.variants.7"]={ squeeze = 0.80, height = 0.80, depth = 0.80 }, + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.05 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. + { + tweak = "dimensions", + list = { + [0x020DB] = { yoffset = -0.015, height = .95, all = true }, -- widedddot : 0x20DB (self) + }, + }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + -- Here we modify "corner kerns". + -- We started with 0x2F, the solidus + -- to have the 2 in x^2/5 a bit over the slash + tweak = "kerns", + list = { + [0x0002F] = { topleft = -0.2, bottomright = -0.2 }, -- solidus + -- + [0x1D49C] = { bottomright = -0.05, }, -- script A + [0x1D49D] = { bottomright = -0.05, }, -- script B + [0x1D49E] = { bottomright = -0.25, }, -- script C + [0x1D49F] = { bottomright = -0.11, }, -- script D + [0x1D4A0] = { bottomright = -0.18, }, -- script E + [0x1D4A1] = { bottomright = -0.30, }, -- script F + [0x1D4A2] = { bottomright = -0.11, }, -- script G + [0x1D4A3] = { bottomright = -0.18, }, -- script H + [0x1D4A4] = { bottomright = -0.25, }, -- script I + [0x1D4A5] = { bottomright = -0.25, }, -- script J + [0x1D4A6] = { bottomright = -0.11, }, -- script K + [0x1D4A7] = { bottomright = -0.05, }, -- script L + [0x1D4A8] = { bottomright = -0.11, }, -- script M + [0x1D4A9] = { bottomright = -0.18, }, -- script N + [0x1D4AA] = { bottomright = -0.05, }, -- script O + [0x1D4AB] = { bottomright = -0.25, }, -- script P + [0x1D4AC] = { bottomright = -0.05, }, -- script Q + [0x1D4AD] = { bottomright = -0.05, }, -- script R + [0x1D4AE] = { bottomright = -0.11, }, -- script S + [0x1D4AF] = { bottomright = -0.33, }, -- script T + [0x1D4B0] = { bottomright = -0.11, }, -- script U + [0x1D4B1] = { bottomright = -0.25, }, -- script V + [0x1D4B2] = { bottomright = -0.25, }, -- script W + [0x1D4B3] = { bottomright = -0.11, }, -- script X + [0x1D4B4] = { bottomright = -0.18, }, -- script Y + [0x1D4B5] = { bottomright = -0.05, }, -- script Z + -- + [0x00393] = { bottomright = -0.20, }, -- upright Gamma + -- + ["0x7D.parts.top"] = { topright = -0.25 }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.25 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.3, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.3 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.2, bottomright = -0.2 }, -- angles + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.2, bottomright = -0.2 }, + ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + + }, + }, + { + -- This one fakes margins to get larger/smaller accents + -- with for example \widetilde. + tweak = "margins", + list = { + [0x1D487] = { left = -.2, right = -.2 }, -- bold italic f + [0x1D489] = { left = -.2, right = -.2 }, -- bold italic h + [0x1D496] = { left = -.1, right = -.1 }, -- bold italic u + [0x1D499] = { left = -.1, right = -.1 }, -- bold italic x + + [0x1D711] = { left = -.1, right = -.1 }, -- italic varphi + [0x1D713] = { left = -.1, right = -.1 }, -- italic psi + + [0x1D659] = { left = -.1, right = -.1 }, -- sans bold italic d + [0x1D65C] = { left = -.1, right = -.1 }, -- sans bold italic g + + [0x1D409] = { left = .1, right = .1 }, -- bold upright J + [0x1D412] = { left = .1, right = .1 }, -- bold upright S + + [0x1D509] = { left = .1, right = .1 }, -- fraktur F + [0x1D50C] = { left = .1, right = .1 }, -- fraktur I + [0x1D50D] = { left = .1, right = .1 }, -- fraktur J + [0x1D51D] = { left = .1, right = .1 }, -- fraktur Z + + [0x1D538] = { left = .1, right = .1 }, -- doublestruck A + [0x1D539] = { left = .1, right = .1 }, -- doublestruck B + [0x1D53C] = { left = .1, right = .1 }, -- doublestruck E + [0x1D53D] = { left = .1, right = .1 }, -- doublestruck F + [0x1D541] = { left = .1, right = .1 }, -- doublestruck J + [0x1D542] = { left = .1, right = .1 }, -- doublestruck K + [0x1D543] = { left = .1, right = .1 }, -- doublestruck L + [0x1D547] = { left = .1, right = .1 }, -- doublestruck P + [0x1D549] = { left = .1, right = .1 }, -- doublestruck R + [0x1D54A] = { left = .1, right = .1 }, -- doublestruck S + [0x1D54B] = { left = .1, right = .1 }, -- doublestruck T + [0x1D54D] = { left = .1, right = .1 }, -- doublestruck V + [0x1D550] = { left = .1, right = .1 }, -- doublestruck Y + + [0x1D506] = { left = .1, right = .1 }, -- fraktur C + + [0x00393] = { left = .1, right = .1 }, -- upfight Gamma + [0x00396] = { left = .1, right = .1 }, -- upfight Zeta + + [0x1D5D8] = { left = .1, right = .1 }, -- sans bold E + [0x1D5D9] = { left = .1, right = .1 }, -- sans bold F + [0x1D5DF] = { left = .1, right = .1 }, -- sans bold L + [0x1D5E6] = { left = .1, right = .1 }, -- sans bold S + + [0x1D61A] = { left = .1, right = .1 }, -- sans italic S + + [0x1D5A2] = { left = .1, right = .1 }, -- sans C + [0x1D5A4] = { left = .1, right = .1 }, -- sans E + [0x1D5A5] = { left = .1, right = .1 }, -- sans F + [0x1D5AF] = { left = .1, right = .1 }, -- sans P + [0x1D5B2] = { left = .1, right = .1 }, -- sans S + [0x1D5B9] = { left = .1, right = .1 }, -- sans Z + + [0x1D4A0] = { left = .1, right = .1 }, -- script E + [0x1D4AE] = { left = .1, right = .1 }, -- script S + [0x1D4B4] = { left = .1, right = .1 }, -- script Y + + [0x0004C] = { left = .1, right = .1 }, -- L + [0x00053] = { left = .1, right = .1 }, -- S + [0x0005A] = { left = .1, right = .1 }, -- Z + + [0x1D43D] = { left = -.1, right = -.1 }, -- italic J + [0x1D409] = { left = -.1, right = -.1 }, -- bold J + [0x1D471] = { left = -.1, right = -.1 }, -- bold italic J + [0x1D4D9] = { left = -.05, right = -.05 }, -- bold script J + }, + }, + { + tweak = "fixprimes", + factor = 0.825, + }, + { + tweak = "checkspacing", + }, + { + tweak = "fixradicals", + }, + { + tweak = "addprivates", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.52, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + tweak = "addequals", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 4, 6, 7 -- In fact, 7 is the last one. + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg new file mode 100644 index 00000000000..cae69aecc12 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/newcomputermodern-math.lfg @@ -0,0 +1,345 @@ +-- In order to be able to use beta math fonts, we use our own file name and +-- always remap. As this font is experimental we don't spend too much time +-- on it now. Even then, we migth stick to design sizes only. + +local dimensions, kerns if CONTEXTLMTXMODE == 0 then + + local kern_150 = { bottomright = { { kern = -150 } } } + local kern_200 = { bottomright = { { kern = -200 } } } + + kerns = { + [0x1D449] = kern_150, -- + [0x1D44A] = kern_200, -- 𝑊 + } + + dimensions = { + -- always applied + -- default = { + -- }, + -- driven by 'mathdimensions' feature + default = { + -- the root is quite displaced + [0x221A] = { + -- 73, -960, 853, 40 + yoffset = 960 - 40, + height = 960, + depth = 40, + }, + -- [0xFE932] = { xoffset = 50, width = 290 }, -- used prime + -- [0x2032] = { xoffset = 50, width = 290 }, -- prime + }, + -- -- seems ok now -- + -- signs = { + -- -- [0x00B1] = { -- ± + -- -- height = 500, depth = 0, + -- -- }, + -- -- [0x2213] = { -- ∓ + -- -- height = 500, depth = 0, + -- -- }, + -- -- move in boundingbox + -- [0x00B1] = { -- ± + -- yoffset = 100, + -- }, + -- [0x2213] = { -- ∓ + -- yoffset = -100, + -- }, + -- }, + } + +end + +return { + name = "newcomputermodern", + version = "1.00", + comment = "Goodies that complement newcomputermodern.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + -- Borrow values from lm: + FractionNumeratorDisplayStyleShiftUp = function(value,target,original) + local o = original.mathparameters.FractionNumeratorDisplayStyleShiftUp + if o > 675 then + o = 600 + else + -- probably tuned + end + return o * target.parameters.factor + end, + NoLimitSupFactor = 0, + NoLimitSubFactor = 1200, + DelimiterPercent = 90, + DelimiterShortfall = 400, + SubscriptBaselineDropMin = 50, -- 200 in font (multiplied by 0.59999/2.39868) + SubscriptShiftDown = 150, -- 247 in font (multiplied to be consistent with cm) + SubscriptShiftDownWithSuperscript = 247, -- relates to the previous one (see math-act) + SuperscriptBaselineDropMax = 386, -- 250 in font (multiplied by 4.6333/2.99 (values in cm/values in lm)) + SuperscriptShiftUp = 413, -- 363 in font (multiplied with 4.9547/4.3536, got 413) + SuperscriptShiftUpCramped = 413, -- 289 in font (no distinction, old TeX) + PrimeShiftUp = "1.1*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.1*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.958", + }, + { + tweak = "fixprimes", + factor = 0.825, + smaller = true, + fake = 0.6, + }, + { + tweak = "kerns", + list = { + [0x0002F] = { topleft = -0.2, bottomright = -0.2 }, -- solidus + -- + [0x00393] = { bottomright = -0.20, }, -- upright Gamma + -- + ["0x7D.parts.top"] = { topright = -0.25 }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.25 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.3, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.3 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.2, bottomright = -0.2 }, -- angles + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.2, bottomright = -0.2 }, + ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + + }, + }, + { + tweak = "checkspacing", + }, + { + tweak = "fixradicals", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + }, + }, + bigs = { + 1, 3, 5, 7 + }, + -- + -- experimental fixes for mkiv: + -- + dimensions = dimensions, + kerns = kerns, + }, + filenames = { + ["latinmodern-math-regular.otf"] = { + "latinmodern-math.otf", -- the beta + "lmmath-regular.otf", + "latinmodernmath-regular.otf", + "lmmath-regular.otf", + "lmodernmath-regular.otf", + "lmodern-math.otf", + }, + }, + designsizes = { + ["LMMathRoman-Regular"] = { + ["4pt"] = "LMMath5-Regular@lmroman5-math", + ["5pt"] = "LMMath5-Regular@lmroman5-math", + ["6pt"] = "LMMath6-Regular@lmroman6-math", + ["7pt"] = "LMMath7-Regular@lmroman7-math", + ["8pt"] = "LMMath8-Regular@lmroman8-math", + ["9pt"] = "LMMath9-Regular@lmroman9-math", + ["10pt"] = "LMMath10-Regular@lmroman10-math", + ["11pt"] = "LMMath10-Regular@lmroman10-math", + ["12pt"] = "LMMath12-Regular@lmroman12-math", + default = "LMMath10-Regular@lmroman10-math" + }, + ["LMMathRoman-Bold"] = { -- not yet ready + ["4pt"] = "LMMath5-Regular@lmroman5-math", + ["5pt"] = "LMMath5-Regular@lmroman5-math", + ["6pt"] = "LMMath6-Regular@lmroman6-math", + ["7pt"] = "LMMath7-Regular@lmroman7-math", + ["8pt"] = "LMMath8-Regular@lmroman8-math", + ["9pt"] = "LMMath9-Regular@lmroman9-math", + ["10pt"] = "LMMath10-Regular@lmroman10-math", + ["11pt"] = "LMMath10-Regular@lmroman10-math", + ["12pt"] = "LMMath12-Regular@lmroman12-math", + default = "LMMath10-Regular@lmroman10-math" + }, + ["LMRoman-Regular"] = { + ["4pt"] = "file:lmroman5-regular", + ["5pt"] = "file:lmroman5-regular", + ["6pt"] = "file:lmroman6-regular", + ["7pt"] = "file:lmroman7-regular", + ["8pt"] = "file:lmroman8-regular", + ["9pt"] = "file:lmroman9-regular", + ["10pt"] = "file:lmroman10-regular", + ["11pt"] = "file:lmroman10-regular", + ["12pt"] = "file:lmroman12-regular", + default = "file:lmroman10-regular", + }, + ["LMRoman-Bold"] = { + ["4pt"] = "file:lmroman5-bold", + ["5pt"] = "file:lmroman5-bold", + ["6pt"] = "file:lmroman6-bold", + ["7pt"] = "file:lmroman7-bold", + ["8pt"] = "file:lmroman8-bold", + ["9pt"] = "file:lmroman9-bold", + ["10pt"] = "file:lmroman10-bold", + ["11pt"] = "file:lmroman10-bold", + ["12pt"] = "file:lmroman12-bold", + default = "file:lmroman10-bold", + }, + ["LMRoman-Demi"] = { + default = "file:lmromandemi10-regular", + }, + ["LMRoman-Italic"] = { + ["4pt"] = "file:lmroman7-italic", + ["5pt"] = "file:lmroman7-italic", + ["6pt"] = "file:lmroman7-italic", + ["7pt"] = "file:lmroman7-italic", + ["8pt"] = "file:lmroman8-italic", + ["9pt"] = "file:lmroman9-italic", + ["10pt"] = "file:lmroman10-italic", + ["11pt"] = "file:lmroman10-italic", + ["12pt"] = "file:lmroman12-italic", + default = "file:lmroman10-italic", + }, + ["LMRoman-Oblique"] = { + ["4pt"] = "file:lmromanslant8-regular", + ["5pt"] = "file:lmromanslant8-regular", + ["6pt"] = "file:lmromanslant8-regular", + ["7pt"] = "file:lmromanslant8-regular", + ["8pt"] = "file:lmromanslant8-regular", + ["9pt"] = "file:lmromanslant9-regular", + ["10pt"] = "file:lmromanslant10-regular", + ["11pt"] = "file:lmromanslant10-regular", + ["12pt"] = "file:lmromanslant12-regular", + default = "file:lmromanslant10-regular", + }, + ["LMRoman-BoldItalic"] = { + default = "file:lmroman10-bolditalic", + }, + ["LMRoman-BoldOblique"] = { + default = "file:lmromanslant10-bold", + }, + ["LMRoman-DemiOblique"] = { + default = "file:lmromandemi10-oblique", + }, + ["LMRoman-CapsRegular"] = { + default = "file:lmromancaps10-regular", + }, + ["LMRoman-CapsOblique"] = { + default = "file:lmromancaps10-oblique", + }, + ["LMRoman-Dunhill"] = { + default = "file:lmromandunh10-regular", + }, + ["LMRoman-DunhillOblique"] = { + default = "file:lmromandunh10-oblique", + }, + ["LMRoman-Unslanted"] = { + default = "file:lmromanunsl10-regular", + }, + ["LMSans-Regular"] = { + ["8pt"] = "file:lmsans8-regular", + ["9pt"] = "file:lmsans9-regular", + ["10pt"] = "file:lmsans10-regular", + ["11pt"] = "file:lmsans10-regular", + ["12pt"] = "file:lmsans12-regular", + default = "file:lmsans10-regular", + }, + ["LMSans-Oblique"] = { + ["8pt"] = "file:lmsans8-oblique", + ["9pt"] = "file:lmsans9-oblique", + ["10pt"] = "file:lmsans10-oblique", + ["11pt"] = "file:lmsans10-oblique", + ["12pt"] = "file:lmsans12-oblique", + default = "file:lmsans10-oblique", + }, + ["LMSans-Bold"] = { + default = "file:lmsans10-bold", + }, + ["LMSans-BoldOblique"] = { + default = "file:lmsans10-boldoblique", + }, + ["LMSans-DemiCondensed"] = { + default = "file:lmsansdemicond10-regular", + }, + ["LMSans-DemiCondensedOblique"] = { + default = "file:lmsansdemicond10-oblique", + }, + ["LMTypewriter-Regular"] = { + ["8pt"] = "file:lmmono8-regular", + ["9pt"] = "file:lmmono9-regular", + ["10pt"] = "file:lmmono10-regular", + ["11pt"] = "file:lmmono10-regular", + ["12pt"] = "file:lmmono12-regular", + default = "file:lmmono10-regular", + }, + ["LMTypewriter-Light"] = { + default = "file:lmmonolt10-regular", + }, + ["LMTypewriter-Dark"] = { + default = "file:lmmonolt10-bold", + }, + ["LMTypewriter-Italic"] = { + default = "file:lmmono10-italic", + }, + ["LMTypewriter-LightOblique"] = { + default = "file:lmmonolt10-oblique", + }, + ["LMTypewriter-Oblique"] = { + default = "file:lmmonoslant10-regular", + }, + ["LMTypewriter-DarkOblique"] = { + default = "file:lmmonolt10-boldoblique", + }, + ["LMTypewriter-LightCondensed"] = { + default = "file:lmmonoltcond10-regular", + }, + ["LMTypewriter-LightCondensedOblique"] = { + default = "file:lmmonoltcond10-oblique", + }, + ["LMTypewriterVarWd-Regular"] = { + default = "file:lmmonoproplt10-regular", + }, + ["LMTypewriterVarWd-Oblique"] = { + default = "file:lmmonoproplt10-oblique", + }, + ["LMTypewriterVarWd-Light"] = { + default = "file:lmmonoprop10-regular", + }, + ["LMTypewriterVarWd-LightOblique"] = { + default = "file:lmmonoprop10-oblique", + }, + ["LMTypewriterVarWd-Dark"] = { + default = "file:lmmonoproplt10-bold", + }, + ["LMTypewriterVarWd-DarkOblique"] = { + default = "file:lmmonoproplt10-boldoblique", + }, + ["LMTypewriter-CapsRegular"] = { + default = "file:lmmonocaps10-regular", + }, + ["LMTypewriter-CapsOblique"] = { + default = "file:lmmonocaps10-oblique", + }, + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg index d4ae1416288..c1d0c7dd5c2 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg @@ -1,34 +1,230 @@ -local kern_V = { bottomright = { { kern = -200 } } } -local kern_W = { bottomright = { { kern = -100 } } } -local offset_f = { xoffset = "llx" } +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets --- Beware of updates in ssty slots! +local integral_variants = { bottomright = -0.20 } +----- integral_top = { topright = 0.05 } +local integral_bottom = { bottomright = -0.20 } return { name = "pagella-math", version = "1.00", comment = "Goodies that complement pagella.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { - dimensions = { - default = { - -- [0x1D453] = { xoffset = 162, width = 278 + 162 },-- 𝑓 - -- [0x1D453] = offset_f, -- 𝑓 - -- ["1:0x1D453"] = offset_f, -- needed for compact - -- ["2:0x1D453"] = offset_f, -- needed for compact - ["*:0x1D453"] = offset_f, -- 𝑓 + parameters = { + AccentTopShiftUp = 10, + FlattenedAccentTopShiftUp = 10, + AccentBaseDepth = 80, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1500 in font + SuperscriptShiftUp = 386, -- 354 in font + SubscriptShiftDown = 200, -- 232 in font + SubscriptShiftDownWithSuperscript = "1.4*SubscriptShiftDown", -- 1.5* in math-act + PrimeShiftUp = "1.3*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.3*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.632", + }, + { + tweak = "fixprimes", + factor = 0.8, + }, + { + tweak = "replacealphabets", + feature = "euleroverpagella", + filename = "euler-math.otf", + list = { + { source = { first = 0x02100, last = 0x02BFF } }, + { source = { first = 0x1D400, last = 0x1D7FF } }, + { source = { first = 0x1D538, last = 0x1D550 } }, + }, + }, + { + tweak = "addmirrors", + }, + { + tweak = "fixoldschool", + feature = "euleroverpagella", + }, + + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.95 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, -- we need to check the 1.5 + presets.wipeanchors { }, + presets.wipeitalics { }, + { + tweak = "parameters", + feature = "euleroverpagella", + list = { + RadicalRuleThickness = 54, + } + }, + { + tweak = "setovershoots", + list = { + { + target = "uppercasescript", + -- quad = true, -- to be decided + topovershoot = 0.05, + }, + { + target = "uppercaseboldscript", + -- quad = true, -- to be decided + topovershoot = 0.05, + }, + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.0, vfactor = 1.1 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00300] = { width = 0.9 }, -- widegrave + [0x00301] = { width = 0.9 }, -- wideacute + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030A] = { width = 0.9, xoffset = -.0 }, -- widering -- weird this one + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. + { + tweak = "dimensions", + list = { + -- here we want to apply to all + [0x020DB] = { yoffset = -0.01, height = .95, all = true }, -- widedddot : 0x20DB (self) + }, + }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "fixslashes", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + -- + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.25, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.25 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + -- angle + [0x27E9] = { topright = -0.2, bottomright = -0.2 }, + ["0x27E9.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + [0x27EB] = { topright = -0.2, bottomright = -0.2 }, + ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, + -- + [0x00393] = { bottomright = -0.20, }, -- upright Gamma + -- + ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int + ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint + ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint + ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint + }, + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "addprivates", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addarrows", + }, + { + tweak = "addbars", + advance = 0.2, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + tweak = "kernpairs", + list = { + -- beware: we kept the italic correction in spite of punctuation class + [0x1D453] = { -- f + [0x3A] = -.1, + [0x3B] = -.1, + }, + }, + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + { + tweak = "parameters", + feature = "emulatelmtx", + comment = "this is for mkiv", + list = { + AccentBaseHeight = 400, + } + }, }, }, - kerns = { - -- [0x1D449] = kern_V, -- 𝑉 - -- ["1:0x1D449"] = kern_V, -- needed for compact - -- ["2:0x1D449"] = kern_V, -- needed for compact - -- [0x1D44A] = kern_W, -- 𝑊 - -- ["1:0x1D44A"] = kern_W, -- needed for compact - -- ["2:0x1D44A"] = kern_W, -- needed for compact - ["*:0x1D449"] = kern_V, -- 𝑉 - ["*:0x1D44A"] = kern_W, -- 𝑊 + bigslots = { + 1, 3, 5, 7 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg index b60bc6d99f9..e4a3ad39796 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg @@ -1,24 +1,148 @@ -local kern_V = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } } -local kern_W = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } } +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets --- Beware of updates in ssty slots! +local integral_variants = { bottomright = -0.20 } +local integral_bottom = { bottomright = -0.20 } return { name = "schola-math", version = "1.00", comment = "Goodies that complement schola.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { - kerns = { - -- [0x1D449] = kern_V, -- 𝑉 - -- ["1:0x1D449"] = kern_V, -- needed for compact - -- ["2:0x1D449"] = kern_V, -- needed for compact - -- [0x1D44A] = kern_W, -- 𝑊 - -- ["1:0x1D44A"] = kern_W, -- needed for compact - -- ["2:0x1D44A"] = kern_W, -- needed for compact - ["*:0x1D449"] = kern_V, -- 𝑉 - ["*:0x1D44A"] = kern_W, -- 𝑊 + parameters = { + AccentTopShiftUp = -15, + FlattenedAccentTopShiftUp = -15, + AccentBaseDepth = 30, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1333 in font + PrimeShiftUp = "1.35*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.35*SuperscriptShiftUp", + -- Can be improved: Smaller script and scriptscript, modified SuperShiftUp and SubShiftDown, ... + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.533", + }, + { + tweak = "fixprimes", + factor = 0.74, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.93 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.25, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.25 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int + ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint + ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint + ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint + }, + }, + + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.1 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. Not in schola + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.27, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 3, 5, 7 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/stix-two-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/stix-two-math.lfg deleted file mode 100644 index 8d9c9c71a1f..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkiv/stix-two-math.lfg +++ /dev/null @@ -1,66 +0,0 @@ --- Bah, I really hate these patches especially because one needs to make --- sure that they are still valid when the font gets updated. So, let's --- do it runtime (not in the cached copy) and issue a warning every run. --- As we cannot rely on version numbers (if we have more patches) we --- check for values instead. --- --- This font also has inconsistent italics in smaller sizes which we can --- fix in a more general way but I'm not sure if we want that. - -local function fix_italic(target,original,name,value,factor) - local m = target.parameters.mathsize - if m then - local u = type(name) == "number" and name or original.resources.unicodes[name] - if u then - local c = target.characters[u] - if c then - local i = c.italic - if i then - local d = original.descriptions[u] - if d and d.math.italic == value then - if m then - logs.report("patching font","fixing italic correction of %U at math size %i by %0.3f",u,m,factor) - c.italic = factor * i - end - end - end - end - end - end -end - -return { - name = "stix-two-math", - version = "1.00", - comment = "Goodies that complement stix two opentype.", - author = "Hans Hagen", - copyright = "ConTeXt development team", - mathematics = { - -- these tags are suggestions and can still change - alternates = { - calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, - italic = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, - barred = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Barred Characters" }, -- hbar, lambdabar etc - primes = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Primes" }, -- larger/lower primes, minute etc - arrow = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, - narrower = { feature = 'ss06', value = 1, comment = "Mathematical Alternative Narrower Elements" }, -- narrower/shorter element etc - small = { feature = 'ss07', value = 1, comment = "Mathematical Alternative Smaller Operators" }, - upright = { feature = 'ss08', value = 1, comment = "Mathematical Alternative Upright Symbols" }, -- upright integrals etc. - negated = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Symbols" }, - relation = { feature = 'ss10', value = 1, comment = "Mathematical Alternative Relations" }, - negatedset = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Set Symbols" }, - -- todo = { feature = 'ss14', value = 1, comment = "" }, - circled = { feature = 'ss16', value = 1, comment = "Mathematical Alternative Circled Operators" }, - }, - tweaks = { - aftercopying = { - function(target,original) - fix_italic(target,original,"uni222B.updsp",80,3.5) - fix_italic(target,original,"uni222B.up", 80,2.5) - end, - }, - }, - }, -} - - diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg new file mode 100644 index 00000000000..b6b1757b6c1 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/stixtwo-math.lfg @@ -0,0 +1,207 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +local integral_variants = { bottomright = -0.4 } +----- integral_top = { topright = 0.05 } +local integral_bottom = { bottomright = -0.35 } + +return { + name = "stix-two-math", + version = "1.00", + comment = "Goodies that complement stix two opentype.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + alternates = { + calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, + italic = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + barred = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Barred Characters" }, -- hbar, lambdabar etc + primes = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Primes" }, -- larger/lower primes, minute etc + arrow = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, + narrower = { feature = 'ss06', value = 1, comment = "Mathematical Alternative Narrower Elements" }, -- narrower/shorter element etc + small = { feature = 'ss07', value = 1, comment = "Mathematical Alternative Smaller Operators" }, + upright = { feature = 'ss08', value = 1, comment = "Mathematical Alternative Upright Symbols" }, -- upright integrals etc. + negated = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Symbols" }, + relation = { feature = 'ss10', value = 1, comment = "Mathematical Alternative Relations" }, + negatedset = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Set Symbols" }, + -- todo = { feature = 'ss14', value = 1, comment = "" }, + circled = { feature = 'ss16', value = 1, comment = "Mathematical Alternative Circled Operators" }, + }, + parameters = { + AccentBaseDepth = 30, + FlattenedAccentTopShiftUp = 0, + RadicalKernAfterDegree = -500, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1800 in font + PrimeShiftUp = "1.3*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.3*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 2.12 b168", + }, + { + tweak = "fixprimes", + factor = 0.84, + }, + { + tweak = "addmirrors", + }, + -- MS: we need to check this, I moved it up + { + tweak = "replacealphabets", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + }, + { + source = "uppercasescript", + target = "uppercasescript", + feature = "ss01", + }, + }, + }, + -- + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.95 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { }, + presets.wipeitalics { }, + { + tweak = "simplifykerns", + }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x29.parts.top"] = { topright = -0.1, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.1 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.2, bottomright = -0.2 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + ["0x222B.parts.bottom"] = { bottomright = -0.30 }, -- int + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = 0.00, vfactor = 0.7 }, + ["0x221A.variants.*"] = { location = "left", hfactor = 0.00, vfactor = 0.55 }, + ["0x221A.variants.3"] = { location = "left", hfactor = 0.00, vfactor = .525 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.00 }, + } + }, + + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.2, anchor = 1.10, xoffset = .05 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. + { + tweak = "dimensions", + list = { + -- here we want to apply to all + [0x020DB] = { yoffset = 0.025, height = .95, all = true }, -- widedddot : 0x20DB (self) + }, + }, + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addarrows", + }, + { + tweak = "fixslashes", + }, + { -- already exists, but not good spacing + tweak = "addbars", + advance = 0.4, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addfourier", + variant = 1, + }, + { + tweak = "addprimed", + }, + { + tweak = "addparts", + list = { + [0x21F4] = { + horizontal = true, + template = 0x2192, + sequence = { + { glyph = "first", factor = 2 }, + { glyph = 0x2218 }, + { glyph = "first", factor = 2 }, + { glyph = "last" }, + } + } + } + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, + bigslots = { + 1, 3, 5, 7 + }, + }, +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg index 3cf8685ebf0..d9c53ee2830 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg @@ -1,33 +1,154 @@ -local kern_V = { bottomright = { { kern = -200 } } } -local kern_W = { bottomright = { { kern = -100 } } } -local offset_f = { xoffset = "llx" } +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets --- Beware of updates in ssty slots! +local integral_variants = { bottomright = -0.20 } +local integral_bottom = { bottomright = -0.30 } return { name = "termes-math", version = "1.00", comment = "Goodies that complement termes.", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", mathematics = { - dimensions = { - default = { - -- [0x1D453] = offset_f, -- 𝑓 - -- ["1:0x1D453"] = offset_f, -- needed for compact - -- ["2:0x1D453"] = offset_f, -- needed for compact - ["*:0x1D453"] = offset_f, -- 𝑓 + parameters = { + AccentTopShiftUp = -15, + FlattenedAccentTopShiftUp = -15, + AccentBaseDepth = 50, + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1300 in font (only one) + SuperscriptShiftUp = 310, -- 339 + SubscriptShiftDown = 200, -- 222 + SubscriptShiftDownWithSuperscript = "1.40*SubscriptShiftDown", -- 1.5* in math-act + PrimeShiftUp = "1.35*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.35*SuperscriptShiftUp", + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.543", + }, + { + tweak = "fixprimes", + factor = 0.76, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.97 }, + presets.rsfsuprighttoscript { rscale = 0.97 }, + presets.moderntocalligraphic { rscale = 0.97 }, + presets.eulertocalligraphic { rscale = 0.97 }, + presets.xitsarabic { rscale = 0.88 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.2, bottomright = -0.2 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.1, bottomright = -0.1 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.1, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.1 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x00393] = { bottomright = -0.20, }, -- upright Gamma + -- + ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int + ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint + ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint + ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint + }, + }, + -- Accents are a mess. We migrate the extensibles from the combiners to the base accent + -- and then need to tweak the width (which is auto set because it was zero with a large + -- accent anchor offset). First we copy and fix. + { + tweak = "extendaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { + [0x221A] = { location = "left", hfactor = 0.0, vfactor = 0.6 }, + ["0x221A.variants.*"] = { location = "left", hfactor = 0.0, vfactor = 0.6 }, + ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.1 }, + } + }, + { + tweak = "fixaccents", + }, + -- First we set the dimensions of the initial accent which started out as zero but we want + -- a proper width. + { + tweak = "dimensions", + list = { + [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + }, + }, + -- Then we deal with all offsets and heights in one go. So we treat the initial accent + -- as well as the variants here. Not in termes. + -- We now copy these to the not wide slots so that we can set these to stretch as well, + -- if only because it is less confusing and more consistent. + { + tweak = "copyaccents", + }, + -- So far for the accents. + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addbars", + advance = 0.3, + }, + { + tweak = "addactuarian", + }, + { + tweak = "addprimed", + }, + { + tweak = "addequals", + }, + { + tweak = "addfourier", + variant = 1, + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, }, }, - kerns = { - -- [0x1D449] = kern_V, -- 𝑉 - -- ["1:0x1D449"] = kern_V, -- needed for compact - -- ["2:0x1D449"] = kern_V, -- needed for compact - -- [0x1D44A] = kern_W, -- 𝑊 - -- ["1:0x1D44A"] = kern_W, -- needed for compact - -- ["2:0x1D44A"] = kern_W, -- needed for compact - ["*:0x1D449"] = kern_V, -- 𝑉 - ["*:0x1D44A"] = kern_W, -- 𝑊 + bigslots = { + 1, 3, 5, 7 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg index 58467129e97..1acebfd5b25 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg @@ -13,13 +13,13 @@ return { { name = "texgyretermes-regular.otf", features = "virtualmath", main = true }, { name = "texgyretermes-regular.otf", features = "virtualmath", vector = "tex-mr-missing" }, { name = "rtxr.tfm", vector = "tex-mr" }, - { name = "rtxptmri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "rtxmi.tfm", vector = "tex-mi", skewchar=0x7F }, - { name = "txsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "rtxptmri.tfm", vector = "tex-it", skewchar = 0x7F }, + { name = "rtxmi.tfm", vector = "tex-mi", skewchar = 0x7F }, + { name = "txsy.tfm", vector = "tex-sy", skewchar = 0x30, parameters = true }, { name = "txex.tfm", vector = "tex-ex", extension = true }, { name = "txsya.tfm", vector = "tex-ma" }, { name = "txsyb.tfm", vector = "tex-mb" }, - { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F }, + { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar = 0x7F }, { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" }, { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true }, { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-adobegaramond.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-adobegaramond.mkiv new file mode 100644 index 00000000000..88ad5ed2cbb --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-adobegaramond.mkiv @@ -0,0 +1,42 @@ +%D \module +%D [ file=type-imp-adobegaramond, +%D version=2021.10.30, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Adobe Garamond, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + + +\starttypescriptcollection[adobegaramond] + + \starttypescript [\s!serif] [adobegaramond] [\s!name] + \setups[font:fallback:serif] + \definefontsynonym [\s!Serif] [\s!file:AGaramondPro-Regular] + \definefontsynonym [\s!SerifItalic] [\s!file:AGaramondPro-Italic] + \definefontsynonym [\s!SerifBold] [\s!file:AGaramondPro-Semibold] + \stoptypescript + + \starttypescript [\s!sans] [frutiger] [\s!name] + \setups[font:fallback:sans] + \definefontsynonym [\s!Sans] [\s!file:FrutigerLTStd-Roman] + \definefontsynonym [\s!SansItalic] [\s!file:FrutigerLTStd-Italic] + \definefontsynonym [\s!SansBold] [\s!file:FrutigerLTStd-Bold] + \stoptypescript + + \starttypescript [\s!math] [garamond-math] [\s!name] + \loadfontgoodies[garamond-math] + \definefontsynonym [\s!MathRoman] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=garamond-math] + \stoptypescript + + \starttypescript[adobegaramond] + \definetypeface [adobegaramond] [\s!rm] [\s!serif] [adobegaramond] [\s!default] + \definetypeface [adobegaramond] [\s!ss] [\s!sans] [frutiger] [\s!default] [\s!rscale=0.85] + \definetypeface [adobegaramond] [\s!mm] [\s!math] [garamond-math] [\s!default] + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-alegreya.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-alegreya.mkiv new file mode 100644 index 00000000000..892173210e1 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-alegreya.mkiv @@ -0,0 +1,86 @@ +%D \module +%D [ file=type-imp-dejavu, +%D version=2010.06.21, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Alegreya fonts, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D This is cleaned up ersion of thwe one on the wiki. The font can be fetched from: +%D +%D \type {https://www.huertatipografica.com/en/fonts/alegreya-ht-pro} + +% \usetypescriptfile[alegreya] +% +% \usebodyfont[alegreya-light] +% \usebodyfont[alegreya-medium] +% +% \setupbodyfont[alegreya] +% +% \setuplayout[tight] +% +% \starttext +% \switchtobodyfont[alegreya-light] \input tufte \par +% \switchtobodyfont[alegreya] \input tufte \par +% \switchtobodyfont[alegreya-medium] \input tufte \par +% \switchtobodyfont[alegreya-light,sans] \input tufte \par +% \switchtobodyfont[alegreya,sans] \input tufte \par +% \switchtobodyfont[alegreya-medium,sans] \input tufte \par +% \stoptext + +\starttypescriptcollection[alegreya] + +\usetypescriptfile + [imp-gentium] + +\definefontfallback + [alegreyagentium-fallback] + [name:gentium] + [greekandcoptic,greekextended] + +\starttypescript [serif] [alegreya-serif,alegreya-light-serif,alegreya-medium-serif] [name] + \setups[font:fallback:serif] + \definefontsynonym[Serif] [name:alegreyaregular] [features=default,fallbacks=alegreya-gentium-fallback] + \definefontsynonym[SerifItalic] [name:alegreyaitalic] [features=default,fallbacks=alegreya-gentium-fallback] + \definefontsynonym[SerifBold] [name:alegreyabold] [features=default,fallbacks=alegreya-gentium-fallback] + \definefontsynonym[SerifBoldItalic] [name:alegreyabolditalic] [features=default,fallbacks=alegreya-gentium-fallback] +\stoptypescript + +\starttypescript [sans] [alegreya-sans] [name] + \setups[font:fallback:sans] + \definefontsynonym [Sans] [name:alegreyasansregular] [features=default] + \definefontsynonym [SansItalic] [name:alegreyasansitalic] [features=default] + \definefontsynonym [SansBold] [name:alegreyasansbold] [features=default] + \definefontsynonym [SansBoldItalic] [name:alegreyasansbolditalic] [features=default] +\stoptypescript + +\starttypescript [sans] [alegreya-light-sans] [name] + \setups[font:fallback:sans] + \definefontsynonym [Sans] [name:alegreyasanslight] [features=default] + \definefontsynonym [SansItalic] [name:alegreyasanslightitalic] [features=default] + \definefontsynonym [SansBold] [name:alegreyasansmedium] [features=default] + \definefontsynonym [SansBoldItalic] [name:alegreyasansmediumitalic] [features=default] +\stoptypescript + +\starttypescript [sans] [alegreya-medium-sans] [name] + \setups[font:fallback:sans] + \definefontsynonym [Sans] [name:alegreyasansmedium] [features=default] + \definefontsynonym [SansItalic] [name:alegreyasansmediumitalic] [features=default] + \definefontsynonym [SansBold] [name:alegreyasansextrabold] [features=default] + \definefontsynonym [SansBoldItalic] [name:alegreyasansextrabolditalic] [features=default] +\stoptypescript + +\starttypescript [alegreya,alegreya-light,alegreya-medium] + \definefallbackfamily[alegreya][serif][gentium][range={greekandcoptic,greekextended}] + \definetypeface [\typescriptone] [rm] [serif] [\typescriptone-serif] [default] + \definetypeface [\typescriptone] [ss] [sans] [\typescriptone-sans] [default] + \definetypeface [\typescriptone] [tt] [mono] [modern] [default] + \definetypeface [\typescriptone] [mm] [math] [default] [default] +\stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-almfixed.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-almfixed.mkiv new file mode 100644 index 00000000000..250b311ce20 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-almfixed.mkiv @@ -0,0 +1,33 @@ +%D \module +%D [ file=type-imp-almfixed, +%D version=2021.10.24, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=ALM Fixed, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\starttypescriptcollection [almfixed] + + \starttypescript [\s!mono] [almfixed] + \definefontsynonym [ALMFixed-Regular] [\s!file:almfixed] [\s!features=\s!none] + \stoptypescript + + \starttypescript [\s!mono] [almfixed] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [ALMFixed-Regular] + \stoptypescript + + \starttypescript [almfixed] + \definetypeface [almfixed] [\s!tt] [\s!mono] [almfixed] [\s!default] + \definetypeface [almfixed] [\s!rm] [\s!serif] [modern] [\s!default] [\s!rscale=0.92] + \definetypeface [almfixed] [\s!ss] [\s!sans] [modern] [\s!default] [\s!rscale=0.92] + \definetypeface [almfixed] [\s!mm] [\s!math] [modern] [\s!default] [\s!rscale=0.92] + \quittypescriptscanning + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv index ba5895c8e4b..f5e3158f4ee 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-antykwa.mkiv @@ -3,7 +3,7 @@ %D version=2010.06.21, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Antykwa Torunska, -%D author=Mojca Miklavec \& Hans Hagen, +%D author=Mojca Miklavec \& Hans Hagen \& Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -13,7 +13,34 @@ \starttypescriptcollection[antykwa-torunska] - \starttypescript [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] + \startsetups[antykwa] + % \setupmathfraction[\c!rule=\v!symbol,\c!middle="0203E]% + % \setupmathradical [\c!rule=\v!symbol,\c!top ="FE010]% + % \setupmathfence [\c!alternative=1]% + \letmathfractionparameter\c!rule\v!symbol + \setmathfractionparameter\c!middle{"203E}% + \letmathradicalparameter \c!rule\v!symbol + \setmathradicalparameter \c!top{\radicalbarextenderuc}% + \setmathfenceparameter \c!alternative{1}% + \stopsetups + + % cond => -cont as in iwona + + \startsetups[antykwa-light] \directsetup{antykwa}\stopsetups + \startsetups[antykwa-cond] \directsetup{antykwa}\stopsetups + \startsetups[antykwa-light-cond] \directsetup{antykwa}\stopsetups + % these long names are obsolete and will go away + \startsetups[antykwa-torunska] \directsetup{antykwa}\stopsetups + \startsetups[antykwa-torunska-light] \directsetup{antykwa}\stopsetups + \startsetups[antykwa-torunska-cond] \directsetup{antykwa}\stopsetups + \startsetups[antykwa-torunska-light-cond]\directsetup{antykwa}\stopsetups + + \definefontfeature[virtualmath-antykwa] [virtualmath][virtualweight=antykwa] + \definefontfeature[virtualmath-antykwa-cond] [virtualmath][virtualweight=antykwa-cond] + \definefontfeature[virtualmath-antykwa-light] [virtualmath][virtualweight=antykwa-light] + \definefontfeature[virtualmath-antykwa-light-cond][virtualmath][virtualweight=antykwa-light-cond] + + \starttypescript [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-light-cond,antykwa-torunska-light-cond] \definetypeface[\typescriptone][\s!rm][\s!serif][\typescriptone] [\s!default] \definetypeface[\typescriptone][\s!ss][\s!sans] [modern] [\s!default] [\s!rscale=1.05] \definetypeface[\typescriptone][\s!tt][\s!mono] [modern] [\s!default] [\s!rscale=1.05] @@ -21,40 +48,23 @@ \quittypescriptscanning \stoptypescript - \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] - \definefontsynonym [AntykwaTorunska-Regular] [\s!file:AntykwaTorunska-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-Italic] [\s!file:AntykwaTorunska-Italic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-Bold] [\s!file:AntykwaTorunska-Bold] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-BoldItalic] [\s!file:AntykwaTorunska-BoldItalic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-Light] [\s!file:AntykwaTorunskaLight-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-LightItalic] [\s!file:AntykwaTorunskaLight-Italic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-Medium] [\s!file:AntykwaTorunskaMed-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-MedItalic] [\s!file:AntykwaTorunskaMed-Italic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondRegular] [\s!file:AntykwaTorunskaCond-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondItalic] [\s!file:AntykwaTorunskaCond-Italic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondBold] [\s!file:AntykwaTorunskaCond-Bold] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondBoldItalic] [\s!file:AntykwaTorunskaCond-BoldItalic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondLight] [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondLightItalic] [\s!file:AntykwaTorunskaCondLight-Italic] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondMedium] [\s!file:AntykwaTorunskaCondMed-Regular] [\s!features=\s!default] - \definefontsynonym [AntykwaTorunska-CondMedItalic] [\s!file:AntykwaTorunskaCondMed-Italic] [\s!features=\s!default] - - \definefontsynonym [AntykwaTorunska-Cap] [\s!file:AntykwaTorunska-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-ItalicCap] [\s!file:AntykwaTorunska-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-BoldCap] [\s!file:AntykwaTorunska-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-BoldItalicCap] [\s!file:AntykwaTorunska-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-LightCap] [\s!file:AntykwaTorunskaLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-LightItalicCap] [\s!file:AntykwaTorunskaLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-MediumCap] [\s!file:AntykwaTorunskaMed-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-MedItalicCap] [\s!file:AntykwaTorunskaMed-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondCap] [\s!file:AntykwaTorunskaCond-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondItalicCap] [\s!file:AntykwaTorunskaCond-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondBoldCap] [\s!file:AntykwaTorunskaCond-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [\s!file:AntykwaTorunskaCond-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondLightCap] [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondLightItalicCap][\s!file:AntykwaTorunskaCondLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondMediumCap] [\s!file:AntykwaTorunskaCondMed-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [AntykwaTorunska-CondMedItalicCap] [\s!file:AntykwaTorunskaCondMed-Italic] [\s!features=\s!smallcaps] + \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-light-cond,antykwa-torunska-light-cond] + \definefontsynonym [AntykwaTorunska-Regular] [\s!file:AntykwaTorunska-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-Italic] [\s!file:AntykwaTorunska-Italic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-Bold] [\s!file:AntykwaTorunska-Bold] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-BoldItalic] [\s!file:AntykwaTorunska-BoldItalic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-Light] [\s!file:AntykwaTorunskaLight-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-LightItalic] [\s!file:AntykwaTorunskaLight-Italic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-Medium] [\s!file:AntykwaTorunskaMed-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-MediumItalic] [\s!file:AntykwaTorunskaMed-Italic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondRegular] [\s!file:AntykwaTorunskaCond-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondItalic] [\s!file:AntykwaTorunskaCond-Italic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondBold] [\s!file:AntykwaTorunskaCond-Bold] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondBoldItalic] [\s!file:AntykwaTorunskaCond-BoldItalic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondLight] [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondLightItalic] [\s!file:AntykwaTorunskaCondLight-Italic] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondMedium] [\s!file:AntykwaTorunskaCondMed-Regular] [\s!features=\s!default] + \definefontsynonym [AntykwaTorunska-CondMediumItalic] [\s!file:AntykwaTorunskaCondMed-Italic] [\s!features=\s!default] \stoptypescript \starttypescript [\s!math][antykwa,antykwa-torunska][\s!all] @@ -62,167 +72,51 @@ \definefontsynonym[\s!MathRoman][antykwamath@antykwa-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-light][\s!all] + \starttypescript [\s!math][antykwa-light,antykwa-torunska-light][\s!all] \loadfontgoodies[antykwa-math] \definefontsynonym[\s!MathRoman][antykwalightmath@antykwa-light-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-cond][\s!all] + \starttypescript [\s!math][antykwa-cond,antykwa-torunska-cond][\s!all] \loadfontgoodies[antykwa-math] \definefontsynonym[\s!MathRoman][antykwacondmath@antykwa-cond-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-lightcond][\s!all] + \starttypescript [\s!math][antykwa-light-cond,antykwa-torunska-light-cond][\s!all] \loadfontgoodies[antykwa-math] - \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-lightcond-math] + \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-light-cond-math] \stoptypescript \starttypescript [\s!serif] [antykwa,antykwa-torunska] [\s!name] - \definefontsynonym [\s!Serif] [AntykwaTorunska-Regular] - \definefontsynonym [\s!SerifBold] [AntykwaTorunska-Bold] - \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-Italic] - \definefontsynonym [\s!SerifSlanted] [AntykwaTorunska-Italic] - \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-BoldItalic] - \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-BoldItalic] - \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-Cap] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [AntykwaTorunska-Regular] + \definefontsynonym [\s!SerifBold] [AntykwaTorunska-Bold] + \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-Italic] + \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-BoldItalic] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name] - \definefontsynonym [\s!Serif] [AntykwaTorunska-Light] - \definefontsynonym [\s!SerifBold] [AntykwaTorunska-Medium] - \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-LightItalic] - \definefontsynonym [\s!SerifSlanted] [AntykwaTorunska-LightItalic] - \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-MedItalic] - \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-MedItalic] - \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-LightCap] + \starttypescript [\s!serif] [antykwa-light,antykwa-torunska-light] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [AntykwaTorunska-Light] + \definefontsynonym [\s!SerifBold] [AntykwaTorunska-Medium] + \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-LightItalic] + \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-MediumItalic] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name] - \definefontsynonym [\s!Serif] [AntykwaTorunska-CondRegular] - \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondBold] - \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondItalic] - \definefontsynonym [\s!SerifSlanted] [AntykwaTorunska-CondItalic] - \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-CondCap] + \starttypescript [\s!serif] [antykwa-cond,antykwa-torunska-cond] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [AntykwaTorunska-CondRegular] + \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondBold] + \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondItalic] + \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondBoldItalic] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name] - \definefontsynonym [\s!Serif] [AntykwaTorunska-CondLight] - \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondMedium] - \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [\s!SerifSlanted] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-CondLightCap] - \stoptypescript - - \starttypescript [\s!serif] [antykwa,antykwa-torunska] [\s!name] - \definefontsynonym [SerifRegular] [Serif] - \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-Cap] - \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-BoldCap] - \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-ItalicCap] - \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-ItalicCap] - \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-BoldItalicCap] - \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-BoldItalicCap] - \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-Cap] - - \definefontsynonym [SerifRegularLight] [AntykwaTorunska-Light] - \definefontsynonym [SerifBoldLight] [AntykwaTorunska-Medium] - \definefontsynonym [SerifItalicLight] [AntykwaTorunska-LightItalic] - \definefontsynonym [SerifSlantedLight] [AntykwaTorunska-LightItalic] - \definefontsynonym [SerifBoldItalicLight] [AntykwaTorunska-MedItalic] - \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-MedItalic] - \definefontsynonym [SerifCapsLight] [AntykwaTorunska-LightCap] - - \definefontsynonym [SerifRegularCond] [AntykwaTorunska-CondRegular] - \definefontsynonym [SerifBoldCond] [AntykwaTorunska-CondBold] - \definefontsynonym [SerifItalicCond] [AntykwaTorunska-CondItalic] - \definefontsynonym [SerifSlantedCond] [AntykwaTorunska-CondItalic] - \definefontsynonym [SerifBoldItalicCond] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondCap] - \stoptypescript - - \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name] - \definefontsynonym [SerifRegular] [Serif] - \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-LightCap] - \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-MediumCap] - \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-LightItalicCap] - \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-LightItalicCap] - \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-MedItalicCap] - \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-MedItalicCap] - \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-LightCap] - - \definefontsynonym [SerifRegularDark] [AntykwaTorunska-Regular] - \definefontsynonym [SerifBoldDark] [AntykwaTorunska-Bold] - \definefontsynonym [SerifItalicDark] [AntykwaTorunska-Italic] - \definefontsynonym [SerifSlantedDark] [AntykwaTorunska-Italic] - \definefontsynonym [SerifBoldItalicDark] [AntykwaTorunska-BoldItalic] - \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-BoldItalic] - \definefontsynonym [SerifCapsDark] [AntykwaTorunska-Cap] - - \definefontsynonym [SerifRegularCond] [AntykwaTorunska-CondLight] - \definefontsynonym [SerifBoldCond] [AntykwaTorunska-CondMedium] - \definefontsynonym [SerifItalicCond] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [SerifSlantedCond] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [SerifBoldItalicCond] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondLightCap] - \stoptypescript - - \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name] - \definefontsynonym [SerifRegular] [Serif] - \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondCap] - \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondBoldCap] - \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-CondItalicCap] - \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-CondItalicCap] - \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-CondBoldItalicCap] - \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondBoldItalicCap] - \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-CondCap] - - \definefontsynonym [SerifRegularLight] [AntykwaTorunska-CondLight] - \definefontsynonym [SerifBoldLight] [AntykwaTorunska-CondMedium] - \definefontsynonym [SerifItalicLight] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [SerifSlantedLight] [AntykwaTorunska-CondLightItalic] - \definefontsynonym [SerifBoldItalicLight] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-CondMedItalic] - \definefontsynonym [SerifCapsLight] [AntykwaTorunska-CondLightCap] - - \definefontsynonym [SerifRegularExp] [AntykwaTorunska-Regular] - \definefontsynonym [SerifBoldExp] [AntykwaTorunska-Bold] - \definefontsynonym [SerifItalicExp] [AntykwaTorunska-Italic] - \definefontsynonym [SerifSlantedExp] [AntykwaTorunska-Italic] - \definefontsynonym [SerifBoldItalicExp] [AntykwaTorunska-BoldItalic] - \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-BoldItalic] - \definefontsynonym [SerifCapsExp] [AntykwaTorunska-Cap] - \stoptypescript - - \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name] - \definefontsynonym [SerifRegular] [Serif] - \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondLightCap] - \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondMediumCap] - \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-CondLightItalicCap] - \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-CondLightItalicCap] - \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-CondMedItalicCap] - \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondMedItalicCap] - \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-CondLightCap] - - \definefontsynonym [SerifRegularDark] [AntykwaTorunska-CondRegular] - \definefontsynonym [SerifBoldDark] [AntykwaTorunska-CondBold] - \definefontsynonym [SerifItalicDark] [AntykwaTorunska-CondItalic] - \definefontsynonym [SerifSlantedDark] [AntykwaTorunska-CondItalic] - \definefontsynonym [SerifBoldItalicDark] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-CondBoldItalic] - \definefontsynonym [SerifCapsDark] [AntykwaTorunska-CondCap] - - \definefontsynonym [SerifRegularExp] [AntykwaTorunska-Light] - \definefontsynonym [SerifBoldExp] [AntykwaTorunska-Medium] - \definefontsynonym [SerifItalicExp] [AntykwaTorunska-LightItalic] - \definefontsynonym [SerifSlantedExp] [AntykwaTorunska-LightItalic] - \definefontsynonym [SerifBoldItalicExp] [AntykwaTorunska-MedItalic] - \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-MedItalic] - \definefontsynonym [SerifCapsExp] [AntykwaTorunska-LightCap] + \starttypescript [\s!serif] [antykwa-light-cond,antykwa-torunska-light-cond] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [AntykwaTorunska-CondLight] + \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondMedium] + \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondMediumItalic] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-asana.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-asana.mkiv deleted file mode 100644 index c48d3b7ad7d..00000000000 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-asana.mkiv +++ /dev/null @@ -1,35 +0,0 @@ -%D \module -%D [ file=type-imp-asana, -%D version=2007.07.30, -%D title=\CONTEXT\ Typescript Macros, -%D subtitle=Asana, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\loadtypescriptfile[texgyre] - -\starttypescriptcollection [asanamath] - - \starttypescript [\s!math] [asana] - \definefontsynonym [AsanaMath] [\s!name:asanamath] - \stoptypescript - - \starttypescript [\s!math] [asana] [\s!name] - \loadfontgoodies[asana-math] - \definefontsynonym [MathRoman] [AsanaMath] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=asana-math] - \stoptypescript - - \starttypescript[asana] - \definetypeface [\typescriptone] [\s!rm] [\s!serif] [palatino] [\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern] [\s!default] [\s!rscale=1.075] - \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] [\s!rscale=1.075] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] - \quittypescriptscanning - \stoptypescript - -\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv index 0ccb4409e3a..c8906df2c60 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-cambria.mkiv @@ -22,7 +22,12 @@ \doifunknownfontfeature {cambria-math-bold} {\definefontfeature[cambria-math-bold][boldened]} - \starttypescript [\s!math,\s!serif] [cambria,cambria-x,cambria-y] + \starttypescript [\s!math] [cambria,cambria-x,cambria-y,cambria-nt,cambria-m,cambria-a] + \checkedmapfontsize[\typescripttwo][\s!script] [.73] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.60] + \stoptypescript + + \starttypescript [\s!math,\s!serif] [cambria,cambria-x,cambria-y,cambria-nt] % whatever matches \definefontsynonym [CambriaMath] [\s!name:cambriamath] \definefontsynonym [CambriaSerif] [\s!name:cambria] @@ -44,21 +49,26 @@ \starttypescript [\s!math] [cambria,cambria-m,cambria-a] [\s!name] \loadfontgoodies[cambria-math] - \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=cambria-math] - \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] + \stoptypescript + \starttypescript [\s!math] [cambria-nt] [\s!name] + \loadfontgoodies[cambria-math] + \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra}] \stoptypescript \starttypescript [\s!math] [cambria-x] [\s!name] \loadfontgoodies[cambria-math] - \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math,mathextra},\s!goodies=cambria-math] - \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math,cambria-math-bold,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math,cambria:mathextra,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] \stoptypescript \starttypescript [\s!math] [cambria-y] [\s!name] \loadfontgoodies[cambria-math] - \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,mathextra},\s!goodies=cambria-math] - \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria-math-bold,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math] + \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math] \stoptypescript - \starttypescript [\s!serif] [cambria,cambria-m,cambria-a] [\s!name] + \starttypescript [\s!serif] [cambria,cambria-m,cambria-a,cambria-nt] [\s!name] \setups[\s!font:\s!fallback:\s!serif] \definefontsynonym [\s!Serif] [CambriaSerif] [\s!features=\s!default,\s!goodies=cambria] \definefontsynonym [\s!SerifBold] [\s!name:cambriabold] [\s!features=\s!default,\s!goodies=cambria] @@ -72,7 +82,7 @@ \definetypeface [cambria] [\s!tt] [\s!mono] [dejavu] [\s!default] \definetypeface [cambria] [\s!mm] [\s!math] [\typescriptone] [\s!default] \stoptypescript - \starttypescript [cambria-x,cambria-y] + \starttypescript [cambria-x,cambria-y,cambria-nt] % test x \definetypeface [\typescriptone] [\s!rm] [\s!serif] [cambria] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv new file mode 100644 index 00000000000..ff4033f8154 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-concrete.mkiv @@ -0,0 +1,77 @@ +%D \module +%D [ file=type-imp-erewhon, +%D version=2022.30.09, % a bit older +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=\TEX Gyre Fonts, +%D author=Mikael Sundqvist, +%D date=\currentdate, +%D copyright={\CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%\loadtypescriptfile[texgyre] +%\resetfontfallback [concrete-euler-fix] +%\definefontfallback[concrete-euler-fix][texgyrepagella-math] [0x022EE,0x022F0,0x022F1,0x02661,0x02220][force=yes] + +\starttypescriptcollection[concrete] + + %\definefontfeature[default-slanted-concrete][default][slant=.2] + %\definefontfeature[none-slanted-concrete] [none] [slant=.2] + + \doifunknownfontfeature {concrete-math-bold} {\definefontfeature[concrete-math-bold][boldened]} + + \starttypescript [\s!serif] [concrete] + \definefontsynonym [\s!Serif] [\s!file:cmunorm] [\s!features=\s!default] + \definefontsynonym [\s!SerifItalic] [\s!file:cmunoti] [\s!features=\s!default] + \definefontsynonym [\s!SerifSlanted] [\s!file:cmunorm] [\s!features=default-slanted-concrete] + \definefontsynonym [\s!SerifBold] [\s!file:cmunobx] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:cmunobi] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldSlanted] [\s!file:cmunobx] [\s!features=default-slanted-concrete] + \stoptypescript + + \starttypescript [\s!sans] [concrete] + \definefontsynonym [\s!Sans] [\s!file:cmunss] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:cmunsi] [\s!features=\s!default] + \definefontsynonym [\s!SansSlanted] [\s!file:cmunss] [\s!features=default-slanted-concrete] + \definefontsynonym [\s!SansBold] [\s!file:cmunsx] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic] [\s!file:cmunso] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldSlanted] [\s!file:cmunsx] [\s!features=default-slanted-concrete] + \stoptypescript + + \starttypescript [\s!mono] [concrete] + \definefontsynonym [\s!Mono] [\s!file:cmuntt] [\s!features=\s!none] + \definefontsynonym [\s!MonoItalic] [\s!file:cmunit] [\s!features=\s!none] + \definefontsynonym [\s!MonoSlanted] [\s!file:cmunst] [\s!features=\s!none] + \definefontsynonym [\s!MonoBold] [\s!file:cmuntb] [\s!features=\s!none] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:cmuntx] [\s!features=\s!none] + \definefontsynonym [\s!MonoBoldSlanted] [\s!file:cmuntb] [\s!features=none-slanted-concrete] + \stoptypescript + + \starttypescript [\s!math] [concrete] + \checkedmapfontsize[\typescripttwo][\s!script] [.76] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.60] + \stoptypescript + + \starttypescript [\s!math] [concrete] [\s!name] + \loadfontgoodies[concrete-math] + \definefontsynonym[\s!MathRoman] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete:mathextra,mathextra},\s!goodies=concrete-math] + \definefontsynonym[\s!MathRomanBold] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete-math-bold,concrete:mathextra,mathextra},\s!goodies=concrete-math] + \stoptypescript + + \starttypescript [\s!math] [concrete-nt] [\s!name] + \loadfontgoodies[concrete-math] + \definefontsynonym[\s!MathRoman] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete-math-bold,concrete:mathextra,mathextra}] + \stoptypescript + + \starttypescript [concrete,concrete-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [concrete] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [concrete] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [concrete] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \quittypescriptscanning + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv index 6da2daa8996..49b788a734e 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv @@ -16,7 +16,7 @@ \definefontfeature[dejavu-condensed-mono][extend=.8] -\starttypescriptcollection[dejavu] +\starttypescriptcollection[xxdejavu] \doifunknownfontfeature {dejavu-math-bold} {\definefontfeature[dejavu-math-bold][boldened]} @@ -44,27 +44,36 @@ \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldoblique] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] \stoptypescript - \starttypescript [\s!math][dejavu][\s!name] - \loadfontgoodies[dejavu-math] - \definefontsynonym[\s!MathRoman] [\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math] - \definefontsynonym[\s!MathRomanBold][\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,dejavu-math-bold,mathextra},\s!goodies=dejavu-math] + \starttypescript [\s!math] [dejavu,dejavu-nt,dejavu-condensed] + \checkedmapfontsize[\typescripttwo][\s!script] [.70]%.80 + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55]%.65 \stoptypescript - \starttypescript[dejavu] - \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu] [\s!default] - \definetypeface [dejavu] [\s!ss] [\s!sans] [dejavu] [\s!default] - \definetypeface [dejavu] [\s!tt] [\s!mono] [dejavu] [\s!default] - % \definetypeface [dejavu] [\s!mm] [\s!math] [xits] [\s!default] [\s!rscale=1.2] - \definetypeface [dejavu] [\s!mm] [\s!math] [dejavu] [\s!default] + \starttypescript [\s!math] [dejavu] [\s!name] + \loadfontgoodies[dejavu-math] + \definefontsynonym[\s!MathRoman] [\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math,\s!fallbacks=\s!Math] + \definefontsynonym[\s!MathRomanBold][\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,dejavu-math-bold,mathextra},\s!goodies=dejavu-math,\s!fallbacks=\s!Math] + \stoptypescript + \starttypescript [\s!math] [dejavu-nt] [\s!name] + \loadfontgoodies[dejavu-math] + \definefontsynonym[\s!MathRoman] [\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra}] + \definefontsynonym[\s!MathRomanBold][\s!file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,dejavu-math-bold,mathextra}] \stoptypescript - \starttypescript[dejavubidi] - \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu] [\s!default] - \definetypeface [dejavu] [\s!ss] [\s!sans] [dejavu] [\s!default] - \definetypeface [dejavu] [\s!tt] [\s!mono] [dejavu] [\s!default] - \definetypeface [dejavu] [\s!mm] [\s!math] [xitsbidi] [\s!default] [\s!rscale=1.2] + \starttypescript[dejavu,dejavu-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [dejavu] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [dejavu] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \stoptypescript + % \starttypescript[dejavubidi] + % \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu] [\s!default] + % \definetypeface [dejavu] [\s!ss] [\s!sans] [dejavu] [\s!default] + % \definetypeface [dejavu] [\s!tt] [\s!mono] [dejavu] [\s!default] + % \definetypeface [dejavu] [\s!mm] [\s!math] [xitsbidi] [\s!default] [\s!rscale=1.2] + % \stoptypescript + \starttypescript [\s!serif] [dejavu-condensed] [\s!name] \setups[\s!font:\s!fallback:\s!serif] \definefontsynonym [\s!Serif] [\s!name:dejavuserifcondensed] [\s!features=\s!default] @@ -83,10 +92,6 @@ \starttypescript [\s!mono] [dejavu-condensed] [\s!name] \setups[\s!font:\s!fallback:\s!mono] - % \definefontsynonym [\s!Mono] [\s!name:dejavusansmonocondensed] [\s!features=\s!none] - % \definefontsynonym [\s!MonoBold] [\s!name:dejavusansmonoboldcondensed] [\s!features=\s!none] - % \definefontsynonym [\s!MonoItalic] [\s!name:dejavusansmonoobliquecondensed] [\s!features=\s!none] - % \definefontsynonym [\s!MonoBoldItalic] [\s!name:dejavusansmonoboldobliquecondensed] [\s!features=\s!none] \definefontsynonym [\s!Mono] [\s!name:dejavusansmono] [\s!features=dejavu-condensed-mono] \definefontsynonym [\s!MonoBold] [\s!name:dejavusansmonobold] [\s!features=dejavu-condensed-mono] \definefontsynonym [\s!MonoItalic] [\s!name:dejavusansmonooblique] [\s!features=dejavu-condensed-mono] @@ -105,7 +110,6 @@ \definetypeface [dejavu-condensed] [\s!rm] [\s!serif] [dejavu-condensed] [\s!default] \definetypeface [dejavu-condensed] [\s!ss] [\s!sans] [dejavu-condensed] [\s!default] \definetypeface [dejavu-condensed] [\s!tt] [\s!mono] [dejavu-condensed] [\s!default] - % \definetypeface [dejavu-condensed] [\s!mm] [\s!math] [xits] [\s!default] [\s!rscale=1.2] \definetypeface [dejavu-condensed] [\s!mm] [\s!math] [dejavu] [\s!default] \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv index 5cafe503f1e..31026df5b21 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv @@ -29,10 +29,15 @@ \definefontfeature [eb-garamond-normal] [default] - [mode=node,ccmp=yes,calt=yes, - liga=yes,dlig=yes,hlig=yes, - kern=yes,mark=yes,mkmk=yes, - onum=yes,pnum=yes,salt=yes, + [mode=node, + ccmp=yes, + calt=yes, + dlig=no, + hlig=no, + % salt=yes, + % onum=yes, + onum=no, + pnum=yes, script=latn] \definefontfeature @@ -40,36 +45,69 @@ [eb-garamond-normal] [smcp=yes,c2sc=yes] +\definefontfeature + [ysabeau-smallcaps] + [default] + [smcp=yes,c2sc=yes] + +% \loadtypescriptfile[ebgaramond] +% +% \definefontfeature +% [eb-garamond-normal] +% [eb-garamond-normal] +% [dlig=no,hlig=no] +% +% \setupbodyfont[ebgaramond] +% +% \starttext +% No weird over the top ligatures. +% \stoptext + \starttypescriptcollection[ebgaramond] - % \starttypescript [serif] [ebgaramond] - % \loadfontgoodies[ebgaramond] - % \setups[font:fallback:serif] - % \definefontsynonym [Serif] [file:ebgaramond-regular] [features=eb-garamond-normal] - % \definefontsynonym [SerifItalic] [file:ebgaramond-italic] [features=eb-garamond-normal] - % \definefontsynonym [SerifBold] [file:ebgaramond-regular] [features=eb-garamond-normal] % there is no bold - % \definefontsynonym [SerifCaps] [Serif] [features=eb-garamond-smallcaps] - % \stoptypescript - - % \starttypescript[ebgaramond] - % \definetypeface [ebgaramond] [rm] [serif] [ebgaramond] [default] [designsize=auto] - % \definetypeface [ebgaramond] [tt] [mono] [dejavu] [default] [rscale=0.8] % rather arbitrary but seldom mixed anyway - % \definetypeface [ebgaramond] [mm] [math] [bonum] [default] [rscale=0.8] % rather arbitrary but seldom mixed anyway - % \stoptypescript - - \starttypescript [serif] [ebgaramond] + \doifunknownfontfeature {ebgaramond-math-bold} {\definefontfeature[ebgaramond-math-bold][boldened]} + + \starttypescript [\s!serif] [ebgaramond] \setups[font:fallback:serif] - \definefontsynonym [Serif] [file:ebgaramond-regular] [features=eb-garamond-normal] - \definefontsynonym [SerifItalic] [file:ebgaramond-italic] [features=eb-garamond-normal] - \definefontsynonym [SerifBold] [file:ebgaramond-bold] [features=eb-garamond-normal] - \definefontsynonym [SerifBoldItalic][file:ebgaramond-bolditalic][features=eb-garamond-normal] - \definefontsynonym [SerifCaps] [Serif] [features=eb-garamond-smallcaps] + \definefontsynonym [\s!Serif] [\s!file:ebgaramond-regular] [\s!features=eb-garamond-normal] + \definefontsynonym [\s!SerifItalic] [\s!file:ebgaramond-italic] [\s!features=eb-garamond-normal] + \definefontsynonym [\s!SerifBold] [\s!file:ebgaramond-bold] [\s!features=eb-garamond-normal] + \definefontsynonym [\s!SerifBoldItalic][\s!file:ebgaramond-bolditalic][\s!features=eb-garamond-normal] + \definefontsynonym [\s!SerifCaps] [\s!Serif] [\s!features=eb-garamond-smallcaps] + \stoptypescript + + + + \starttypescript [\s!sans] [ysabeau] + % \setups[font:fallback:sans] + \definefontsynonym [\s!Sans] [\s!file:ysabeau-regular] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:ysabeau-italic] [\s!features=\s!default] + \definefontsynonym [\s!SansBold] [\s!file:ysabeau-bold] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic][\s!file:ysabeau-bolditalic] [\s!features=\s!default] + \definefontsynonym [\s!SansCaps] [\s!Sans] [\s!features=ysabeau-smallcaps] + \stoptypescript + + \starttypescript [\s!math] [ebgaramond,ebgaramond-nt] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50] + \stoptypescript + + \starttypescript [\s!math] [ebgaramond] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond:mathextra,mathextra},\s!goodies=ebgaramond-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond-math-bold,ebgaramond:mathextra,mathextra},\s!goodies=ebgaramond-math] + \stoptypescript + + \starttypescript [\s!math] [ebgaramond-nt] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond-math-bold,ebgaramond:mathextra,mathextra}] \stoptypescript - \starttypescript[ebgaramond] - \definetypeface [ebgaramond] [rm] [serif] [ebgaramond] [default] - \definetypeface [ebgaramond] [tt] [mono] [dejavu] [default] [rscale=0.8] % rather arbitrary but seldom mixed anyway - \definetypeface [ebgaramond] [mm] [math] [bonum] [default] [rscale=0.8] % rather arbitrary but seldom mixed anyway + \starttypescript[ebgaramond,ebgaramond-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [ebgaramond] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [ysabeau] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.8] + % \definetypeface [\typescriptone] [\s!mm] [\s!math] [bonum] [\s!default] [\s!rscale=0.8] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv new file mode 100644 index 00000000000..c536caa0eb7 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-erewhon.mkiv @@ -0,0 +1,71 @@ +%D \module +%D [ file=type-imp-erewhon, +%D version=2022.30.09, % a bit older +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=\TEX Gyre Fonts, +%D author=Mikael Sundqvist, +%D date=\currentdate, +%D copyright={\CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%\loadtypescriptfile[texgyre] +%\resetfontfallback [erewhon-euler-fix] +%\definefontfallback[erewhon-euler-fix][texgyrepagella-math] [0x022EE,0x022F0,0x022F1,0x02661,0x02220][force=yes] + +\starttypescriptcollection[erewhon] + + %\definefontfeature[default-slanted-erewhon][default][slant=.2] + %\definefontfeature[none-slanted-erewhon] [none] [slant=.2] + + \doifunknownfontfeature {erewhon-math-bold} {\definefontfeature[erewhon-math-bold][boldened]} + + \starttypescript [\s!serif] [erewhon] + \definefontsynonym [\s!Serif] [\s!file:Erewhon-Regular] [\s!features=\s!default] + \definefontsynonym [\s!SerifItalic] [\s!file:Erewhon-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SerifSlanted] [\s!file:Erewhon-RegularSlanted][\s!features=\s!default] + \definefontsynonym [\s!SerifBold] [\s!file:Erewhon-Bold] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:Erewhon-BoldItalic] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldSlanted][\s!file:Erewhon-BoldSlanted] [\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!sans] [cabin-sans] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:Cabin-Regular] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:Cabin-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SansBold] [\s!file:Cabin-SemiBold] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic][\s!file:Cabin-SemiBoldItalic][\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!mono] [inconsolata-mono] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [\s!file:Inconsolatazi4-Regular][\s!features=\s!none] + \definefontsynonym [\s!MonoBold][\s!file:Inconsolatazi4-Bold] [\s!features=\s!none] + \stoptypescript + + \starttypescript [\s!math] [erewhon,erewhon-nt] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + + \starttypescript [\s!math] [erewhon] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra},\s!goodies=erewhon-math] + \definefontsynonym [\s!MathRomanBold][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon-math-bold,erewhon:mathextra,mathextra},\s!goodies=erewhon-math] + \stoptypescript + + \starttypescript [\s!math] [erewhon-nt] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon-math-bold,erewhon:mathextra,mathextra}] + \stoptypescript + + \starttypescript [erewhon,erewhon-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [erewhon] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [cabin] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [inconsolata] [\s!default] [\s!rscale=1.1] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \quittypescriptscanning + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv index 64961830c31..4901c1dcb82 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv @@ -11,6 +11,10 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% Instead of euler.otf we now use euler-math.otf which is a copy of the version +% that Daniel Flipo maintains now. We will also make an euler-regular.otf for +% text usage (which might have slighty different metrics then). + \loadtypescriptfile[texgyre] \loadtypescriptfile[dejavu] @@ -21,14 +25,13 @@ % 0x1D455 : italic h -\definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x02100-0x02BFF] [\s!check=yes,\c!force=yes] -\definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x1D400-0x1D7FF] [\s!check=yes,\c!force=yes] -\definefontfallback [euleroverpagella] [texgyrepagella-math] [0x0210E] [\s!check=yes,\c!force=\v!yes] -%definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x1D538-0x1D550] [\s!check=yes,\c!force=yes] +\definefontfallback [euleroverpagella] [\s!file:euler-math.otf] [0x02100-0x02BFF] [\s!check=yes,\c!force=yes] +\definefontfallback [euleroverpagella] [\s!file:euler-math.otf] [0x1D400-0x1D7FF] [\s!check=yes,\c!force=yes] +\definefontfallback [euleroverpagella] [texgyrepagella-math] [0x0210E] [\s!check=yes,\c!force=\v!yes] +%definefontfallback [euleroverpagella] [\s!file:euler-math.otf] [0x1D538-0x1D550] [\s!check=yes,\c!force=yes] \definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x02100-0x02BFF] [\s!check=yes] \definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes] -\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes] \definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x0210E] [\s!check=yes,\c!force=\v!yes] %definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D538-0x1D550] [\s!check=yes] @@ -44,12 +47,12 @@ \starttypescript [\s!serif] [eulernova] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [\s!file:euler.otf] [\s!features=\s!default] + \definefontsynonym [\s!Serif] [\s!file:euler-math.otf] [\s!features=\s!default] \stoptypescript \starttypescript [\s!math] [eulernova] [\s!name] % \loadfontgoodies[euler-math] - \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] + \definefontsynonym [MathRoman] [\s!file:euler-math.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=euler-math] \stoptypescript \starttypescript [pagella-eulernova] @@ -67,11 +70,11 @@ \stoptypescript \starttypescript [\s!math] [euleroverpagella] [\s!name] - \definefontsynonym [MathRoman] [texgyrepagella-math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=euleroverpagella] + \definefontsynonym [MathRoman] [texgyrepagella-math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=euleroverpagella,\s!goodies=pagella-with-euler-math] \stoptypescript \starttypescript [\s!math] [pagellaovereuler] [\s!name] - \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=pagellaovereuler] + \definefontsynonym [MathRoman] [\s!file:euler-math.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=pagellaovereuler,\s!goodies=euler-with-pagella-math] \stoptypescript \starttypescript [pagella-with-euler] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-gentium.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-gentium.mkiv index 751ca87e7e5..20e6f79ff11 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-gentium.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-gentium.mkiv @@ -1,36 +1,81 @@ %D \module %D [ file=type-gentium, -%D version=2013.05.02, +%D version=20220521,, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Typescript file for Gentium, -%D author={Thomas A. Schmitz and Mojca Miklavec}, +%D author=Hans Hagen, %D date=\currentdate, -%D copyright={Mojca and Thomas}] - -% One probably has to enable the 'aalt' feature too. - -\starttypescript [serif] [gentium] - \definefontsynonym [Gentium-Roman] [file:GentiumPlus-R] [features=default] - \definefontsynonym [Gentium-Italic] [file:GentiumPlus-I] [features=default] - \definefontsynonym [Gentium-Bold] [file:GenBasB] [features=default] - \definefontsynonym [Gentium-BoldItalic] [file:GenBasBI] [features=default] - \definefontsynonym [Gentium-Slanted] [Gentium-Italic] - \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic] - \definefontsynonym [Gentium-RomanCaps] [file:GentiumPlus-R] [features=smallcaps] +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] + +% The file is derived from one by Thomas and Mojca (20130502). + +\usetypescriptfile[dejavu] + +\starttypescript [serif] [gentium,gentiumplus] + \definefontsynonym [Gentium-Roman] [file:GentiumPlus-Regular] [features=default] + \definefontsynonym [Gentium-Italic] [file:GentiumPlus-Italic] [features=default] + \definefontsynonym [Gentium-Bold] [file:GentiumPlus-Bold] [features=default] + \definefontsynonym [Gentium-BoldItalic] [file:GentiumPlus-BoldItalic] [features=default] + \definefontsynonym [Gentium-Slanted] [file:GentiumPlus-Regular] [features={default,slanted}] + \definefontsynonym [Gentium-BoldSlanted] [file:GentiumPlus-Bold] [features={default,slanted}] +\stoptypescript + +\starttypescript [serif] [gentiumbook] + \definefontsynonym [Gentium-Roman] [file:GentiumBookPlus-Regular] [features=default] + \definefontsynonym [Gentium-Italic] [file:GentiumBookPlus-Italic] [features=default] + \definefontsynonym [Gentium-Bold] [file:GentiumBookPlus-Bold] [features=default] + \definefontsynonym [Gentium-BoldItalic] [file:GentiumBookPlus-BoldItalic] [features=default] + \definefontsynonym [Gentium-Slanted] [file:GentiumBookPlus-Regular] [features={default,slanted}] + \definefontsynonym [Gentium-BoldSlanted] [file:GentiumBookPlus-Bold] [features={default,slanted}] \stoptypescript -\starttypescript [serif] [gentium] [name] +\starttypescript [serif] [gentium,gentiumplus,gentiumbook] [name] \definefontsynonym [Serif] [Gentium-Roman] \definefontsynonym [SerifItalic] [Gentium-Italic] \definefontsynonym [SerifBold] [Gentium-Bold] \definefontsynonym [SerifBoldItalic] [Gentium-BoldItalic] \definefontsynonym [SerifSlanted] [Gentium-Slanted] \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted] - \definefontsynonym [SerifCaps] [Serif] - \definefontsynonym [OldStyle] [Serif] - \definefontsynonym [SerifCaps] [Gentium-RomanCaps] \stoptypescript -\starttypescript [gentium] - \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default] +% HH: we probably need to rscale dejavu here .. feel free to suggest + +\starttypescript [gentium,gentiumplus,gentiumbook] + \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default] [features=default] + \definetypeface [\typescriptone] [ss] [sans] [dejavu] [default] [features=default] + \definetypeface [\typescriptone] [tt] [mono] [dejavu] [default] [features=default] + \definetypeface [\typescriptone] [mm] [math] [dejavu] [default] \stoptypescript + +\continueifinputfile{type-imp-gentium.mkiv} + +\usemodule[article-basic,scite] + +\setuplayout[tight] + +\usebodyfont [gentiumbook] +\setupbodyfont[gentiumplus] + +\starttext + +\protected\def\TestLine#1{% + \NC #1 + \NC \switchtobodyfont[#1]\tf normal + \NC \switchtobodyfont[#1]\bf bold + \NC \switchtobodyfont[#1]\it italic + \NC \switchtobodyfont[#1]\bi bolditalic + \NC \switchtobodyfont[#1]\sl slanted + \NC \switchtobodyfont[#1]\bs boldslanted + \NC \NR +} + +\starttabulate[|T|c|c|c|c|c|c|] + \TestLine{gentiumplus} + \TestLine{gentiumbook} +\stoptabulate + +\switchtobodyfont[8pt] + +\typefile[option=TEX]{type-imp-gentium.mkiv} + +\stoptext diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-hcrfonts.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-hcrfonts.mkiv new file mode 100644 index 00000000000..60ce20bf0cc --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-hcrfonts.mkiv @@ -0,0 +1,141 @@ +%D \module +%D [ file=type-imp-unfonts, +%D version=2012.03.11, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=UnFonts, +%D author=Dalyoung \& Hans, +%D date=\currentdate, +%D copyright=Dalyoung \& Hans] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% usage: \setupbodyfont[hcrfonts] + +\loadtypescriptfile[texgyre] + +\definefontfeature + [kr-default] + [mode=node,script=hang,lang=kor] + +\definefontfeature + [kr-slanted] + [mode=node,script=hang,lang=kor,slant=.2] + +\definefontfeature + [kr-latin-default] + [default] + +\definefontfeature + [kr-latin-slanted] + [krlatindefault] + [slant=.2] + +\definefontfeature + [kr-latin-slanted-mono] + [slant=.2] + +\definefontfeature + [kr-latin-smallcaps] + [krlatindefault] + [smcp=yes] + +\definefontfeature + [kr-latin-smallcaps-mono] + [cmcp=yes] + +\definefontfallback[kr-serif] [texgyrepagella-regular*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifbold] [texgyrepagella-bold*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifitalic] [texgyrepagella-italic*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifbolditalic] [texgyrepagella-bolditalic*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifslanted] [texgyrepagella-regular*kr-latin-slanted] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifboldslanted][texgyrepagella-bold*kr-latin-slanted] [0x0000-0x0400][force=yes] +\definefontfallback[kr-serifcaps] [texgyrepagella-regular*kr-latin-smallcaps] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sans] [texgyreheros-regular*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sansbold] [texgyreheros-bold*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sansitalic] [texgyreheros-italic*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sansbolditalic] [texgyreheros-bolditalic*kr-latin-default] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sansslanted] [texgyreheros-regular*kr-latin-slanted] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sansboldslanted] [texgyreheros-bold*kr-latin-slanted] [0x0000-0x0400][force=yes] +\definefontfallback[kr-sanscaps] [texgyreheros-regular*kr-latin-smallcaps] [0x0000-0x0400][force=yes] +\definefontfallback[kr-mono] [texgyrecursor-regular] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monobold] [texgyrecursor-bold] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monoitalic] [texgyrecursor-italic] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monobolditalic] [texgyrecursor-bolditalic] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monoslanted] [texgyrecursor-regular*kr-latin-slanted-mono] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monoboldslanted] [texgyrecursor-bold*kr-latin-slanted-mono] [0x0000-0x0400][force=yes] +\definefontfallback[kr-monocaps] [texgyrecursor-regular*kr-latin-smallcaps-mono][0x0000-0x0400][force=yes] + +\starttypescriptcollection[hcrLVT] + + \starttypescript [\s!serif] [hcrBatang] + \definefontsynonym [hcrBatang] [\s!file:HanBatang-LVT.ttf] [\s!features=kr-default,\s!fallbacks=kr-serif] + \definefontsynonym [hcrBatangBold] [\s!file:HanBatangB-LVT.ttf][\s!features=kr-default,\s!fallbacks=kr-serifbold] + \definefontsynonym [hcrBatangItalic] [\s!file:HanBatang-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-serifitalic] + \definefontsynonym [hcrBatangBolditalic] [\s!file:HanBatangB-LVT.ttf][\s!features=kr-slanted,\s!fallbacks=kr-serifbolditalic] + \definefontsynonym [hcrBatangSlanted] [\s!file:HanBatang-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-serifslanted] + \definefontsynonym [hcrBatangBoldslanted][\s!file:HanBatangB-LVT.ttf][\s!features=kr-slanted,\s!fallbacks=kr-serifboldslanted] + \definefontsynonym [hcrBatangCaps] [\s!file:HanBatang-LVT.ttf] [\s!features=kr-default,\s!fallbacks=kr-serifcaps] + \stoptypescript + + \starttypescript [\s!sans] [hcrDotum] + \definefontsynonym[hcrDotum] [\s!file:HanDotum-LVT.ttf] [\s!features=kr-default,\s!fallbacks=kr-sans] + \definefontsynonym[hcrDotumBold] [\s!file:HanDotumB-LVT.ttf] [\s!features=kr-default,\s!fallbacks=kr-sansbold] + \definefontsynonym[hcrDotumItalic] [\s!file:HanDotum-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-sansitalic] + \definefontsynonym[hcrDotumBolditalic] [\s!file:HanDotumB-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-sansbolditalic] + \definefontsynonym[hcrDotumSlanted] [\s!file:HanDotum-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-sansslanted] + \definefontsynonym[hcrDotumBoldslanted] [\s!file:HanDotumB-LVT.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-sansboldslanted] + \definefontsynonym[hcrDotumCaps] [\s!file:HanDotum-LVT.ttf] [\s!features=kr-default,\s!fallbacks=kr-sanscaps] + \stoptypescript + + \starttypescript [\s!mono] [hcrType] + \definefontsynonym[hcrType] [\s!file:UnTaza.ttf] [\s!features=kr-default,\s!fallbacks=kr-mono] + \definefontsynonym[hcrTypeBold] [\s!file:UnTaza.ttf] [\s!features=kr-default,\s!fallbacks=kr-monobold] + \definefontsynonym[hcrTypeItalic] [\s!file:UnTaza.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-monoitalic] + \definefontsynonym[hcrTypeBolditalic] [\s!file:UnTaza.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-monobolditalic] + \definefontsynonym[hcrTypeSlanted] [\s!file:UnTaza.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-monoslanted] + \definefontsynonym[hcrTypeBoldslanted] [\s!file:UnTaza.ttf] [\s!features=kr-slanted,\s!fallbacks=kr-monoboldslanted] + \definefontsynonym[hcrTypeCaps] [\s!file:UnTaza.ttf] [\s!features=kr-default,\s!fallbacks=kr-monocaps] + \stoptypescript + + \starttypescript [\s!serif] [hcrBatang] [\s!name] + \definefontsynonym[\s!Serif] [hcrBatang] + \definefontsynonym[\s!SerifBold] [hcrBatangBold] + \definefontsynonym[\s!SerifItalic] [hcrBatangItalic] + \definefontsynonym[\s!SerifBoldItalic] [hcrBatangBolditalic] + \definefontsynonym[\s!SerifSlanted] [hcrBatangSlanted] + \definefontsynonym[\s!SerifBoldSlanted][hcrBatangBoldslanted] + \definefontsynonym[\s!SerifCaps] [hcrBatangCaps] + \stoptypescript + + \starttypescript [\s!sans] [hcrDotum] [\s!name] + \definefontsynonym[\s!Sans] [hcrDotum] + \definefontsynonym[\s!SansBold] [hcrDotumBold] + \definefontsynonym[\s!SansItalic] [hcrDotumItalic] + \definefontsynonym[\s!SansBoldItalic] [hcrDotumBolditalic] + \definefontsynonym[\s!SansSlanted] [hcrDotumSlanted] + \definefontsynonym[\s!SansBoldSlanted] [hcrDotumBoldslanted] + \definefontsynonym[\s!SansCaps] [hcrDotumCaps] + \stoptypescript + + \starttypescript [\s!mono] [hcrType] [\s!name] + \definefontsynonym[\s!Mono] [hcrType] + \definefontsynonym[\s!MonoBold] [hcrTypeBold] + \definefontsynonym[\s!MonoItalic] [hcrTypeItalic] + \definefontsynonym[\s!MonoBoldItalic] [hcrTypeBolditalic] + \definefontsynonym[\s!MonoSlanted] [hcrTypeSlanted] + \definefontsynonym[\s!MonoBoldSlanted] [hcrTypeBoldslanted] + \definefontsynonym[\s!MonoCaps] [hcrTypeCaps] + \stoptypescript + + % xits might get replaced with a pagella once we have it + + \starttypescript[hcrfonts] + \definetypeface [hcrfonts] [\s!rm] [\s!serif] [hcrBatang] + \definetypeface [hcrfonts] [\s!ss] [\s!sans] [hcrDotum] + \definetypeface [hcrfonts] [\s!tt] [\s!mono] [hcrType] + \definetypeface [hcrfonts] [\s!mm] [\s!math] [pagella] + \stoptypescript + +\stoptypescriptcollection
\ No newline at end of file diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-iwona.mkiv index 88cb7e719c3..f4373125083 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-iwona.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-iwona.mkiv @@ -3,7 +3,7 @@ %D version=2010.06.21, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Iwona, -%D author=Mojca Miklavec \& Hans Hagen, +%D author=Mojca Miklavec \& Hans Hagen \& Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -13,69 +13,65 @@ \starttypescriptcollection[iwona] - % maybe this will change in Iwona-Math-Letters and Iwona-Math-Letters-Italic - - % These names are a depressing mess. They have changed over time and are - % still not consistent. I'd expect Bold-Regular and Bold-Italic. - - \starttypescript [\s!sans] [iwona-light,iwona,iwona-medium,iwona-heavy,iwona-light-cond,iwona-cond,iwona-medium-cond,iwona-heavy-cond] - - \definefontsynonym [Iwona-Regular] [\s!file:Iwona-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-Italic] [\s!file:Iwona-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-Bold] [\s!file:Iwona-Bold] [\s!features=\s!default] - \definefontsynonym [Iwona-BoldItalic] [\s!file:Iwona-BoldItalic] [\s!features=\s!default] - \definefontsynonym [Iwona-Light-Regular] [\s!file:IwonaLight-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-Light-Italic] [\s!file:IwonaLight-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-Medium-Regular] [\s!file:IwonaMedium-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-Medium-Italic] [\s!file:IwonaMedium-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-Heavy-Regular] [\s!file:IwonaHeavy-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-Heavy-Italic] [\s!file:IwonaHeavy-Italic] [\s!features=\s!default] - - \definefontsynonym [Iwona-CapsRegular] [\s!file:Iwona-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsItalic] [\s!file:Iwona-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsBold] [\s!file:Iwona-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsBoldItalic] [\s!file:Iwona-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsLight] [\s!file:IwonaLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsLight-Italic] [\s!file:IwonaLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsMedium] [\s!file:IwonaMedium-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsMedium-Italic] [\s!file:IwonaMedium-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsHeavy] [\s!file:IwonaHeavy-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsHeavy-Italic] [\s!file:IwonaHeavy-Italic] [\s!features=\s!smallcaps] - - \definefontsynonym [Iwona-CondRegular] [\s!file:IwonaCond-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-CondItalic] [\s!file:IwonaCond-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-CondBold] [\s!file:IwonaCond-Bold] [\s!features=\s!default] - \definefontsynonym [Iwona-CondBoldItalic] [\s!file:IwonaCond-BoldItalic] [\s!features=\s!default] - \definefontsynonym [Iwona-CondLight-Regular] [\s!file:IwonaCondLight-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-CondLight-Italic] [\s!file:IwonaCondLight-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-CondMedium-Regular] [\s!file:IwonaCondMedium-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-CondMedium-Italic] [\s!file:IwonaCondMedium-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-CondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular] [\s!features=\s!default] - \definefontsynonym [Iwona-CondHeavy-Italic] [\s!file:IwonaCondHeavy-Italic] [\s!features=\s!default] - - \definefontsynonym [Iwona-CapsCondRegular] [\s!file:IwonaCond-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondItalic] [\s!file:IwonaCond-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondBold] [\s!file:IwonaCond-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondBoldItalic] [\s!file:IwonaCond-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondLight-Regular] [\s!file:IwonaCondLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondLight-Italic] [\s!file:IwonaCondLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondMedium-Regular][\s!file:IwonaCondMedium-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondMedium-Italic] [\s!file:IwonaCondMedium-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondHeavy-Italic] [\s!file:IwonaCondHeavy-Italic] [\s!features=\s!smallcaps] + \startsetups[iwona] + % \setupmathfence [\c!alternative=1]% + \setmathfenceparameter \c!alternative{1}% +% \letmathfractionparameter\c!rule\v!symbol +% \setmathfractionparameter\c!middle{"203E}% +% \letmathradicalparameter \c!rule\v!symbol +% \setmathradicalparameter \c!top{\radicalbarextenderuc}% +% \setmathfenceparameter \c!alternative{1}% + \stopsetups + + \startsetups[iwona-light] \directsetup{antykwa}\stopsetups + \startsetups[iwona-medium] \directsetup{antykwa}\stopsetups + \startsetups[iwona-heavy] \directsetup{antykwa}\stopsetups + \startsetups[iwona-cond] \directsetup{antykwa}\stopsetups + \startsetups[iwona-light-cond] \directsetup{antykwa}\stopsetups + \startsetups[iwona-medium-cond]\directsetup{antykwa}\stopsetups + \startsetups[iwona-heavy-cond] \directsetup{antykwa}\stopsetups + + \definefontfeature[virtualmath-iwona] [virtualmath][virtualweight=iwona] + \definefontfeature[virtualmath-iwona-light] [virtualmath][virtualweight=iwona-light] + \definefontfeature[virtualmath-iwona-medium][virtualmath][virtualweight=iwona-medium] + \definefontfeature[virtualmath-iwona-heavy] [virtualmath][virtualweight=iwona-heavy] + + \starttypescript [\s!sans] [iwona,iwona-light,iwona-medium,iwona-heavy,iwona-cond,iwona-light-cond,iwona-medium-cond,iwona-heavy-cond] + + \definefontsynonym [Iwona-Regular] [\s!file:Iwona-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-Italic] [\s!file:Iwona-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-Bold] [\s!file:Iwona-Bold] [\s!features=\s!default] + \definefontsynonym [Iwona-BoldItalic] [\s!file:Iwona-BoldItalic] [\s!features=\s!default] + \definefontsynonym [Iwona-Light-Regular] [\s!file:IwonaLight-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-Light-Italic] [\s!file:IwonaLight-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-Medium-Regular] [\s!file:IwonaMedium-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-Medium-Italic] [\s!file:IwonaMedium-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-Heavy-Regular] [\s!file:IwonaHeavy-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-Heavy-Italic] [\s!file:IwonaHeavy-Italic] [\s!features=\s!default] + + \definefontsynonym [Iwona-CondRegular] [\s!file:IwonaCond-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-CondItalic] [\s!file:IwonaCond-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-CondBold] [\s!file:IwonaCond-Bold] [\s!features=\s!default] + \definefontsynonym [Iwona-CondBoldItalic] [\s!file:IwonaCond-BoldItalic] [\s!features=\s!default] + \definefontsynonym [Iwona-CondLight-Regular] [\s!file:IwonaCondLight-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-CondLight-Italic] [\s!file:IwonaCondLight-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-CondMedium-Regular] [\s!file:IwonaCondMedium-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-CondMedium-Italic] [\s!file:IwonaCondMedium-Italic] [\s!features=\s!default] + \definefontsynonym [Iwona-CondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular] [\s!features=\s!default] + \definefontsynonym [Iwona-CondHeavy-Italic] [\s!file:IwonaCondHeavy-Italic] [\s!features=\s!default] \stoptypescript % [all] is redundant \starttypescript [\s!math][iwona][\s!all] - \definefontsynonym[\s!MathRoman][iwonamath@iwona-math] + \definefontsynonym[\s!MathRoman] [iwonamath@iwona-math] \stoptypescript \starttypescript [\s!math][iwona-light][\s!all] - \definefontsynonym[\s!MathRoman][iwonalightmath@iwona-light-math] + \definefontsynonym[\s!MathRoman] [iwonalightmath@iwona-light-math] \stoptypescript \starttypescript [\s!math][iwona-medium][\s!all] - \definefontsynonym[\s!MathRoman][iwonamediummath@iwona-medium-math] + \definefontsynonym[\s!MathRoman] [iwonamediummath@iwona-medium-math] \stoptypescript \starttypescript [\s!math][iwona-heavy][\s!all] \definefontsynonym[\s!MathRoman][iwonaheavymath@iwona-heavy-math] @@ -87,142 +83,59 @@ \starttypescript [\s!sans] [iwona-light] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-Light-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-Light-Italic] - \definefontsynonym [\s!SansBold] [Iwona-Medium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-Medium-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsLight] - \definefontsynonym [SansItalicCaps] [Iwona-CapsLightItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsMedium] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsMediumItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-light-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsLight-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsLight-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsMedium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsMedium-Italic] + \definefontsynonym [\s!Sans] [Iwona-Light-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-Light-Italic] + \definefontsynonym [\s!SansBold] [Iwona-Medium-Regular] + \definefontsynonym [\s!SansBoldItalic] [Iwona-Medium-Italic] \stoptypescript \starttypescript [\s!sans] [iwona] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-Italic] - \definefontsynonym [\s!SansBold] [Iwona-Bold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-BoldItalic] - \definefontsynonym [SansCaps] [Iwona-CapsRegular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsBold] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsBoldItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsRegular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsItalic] - \definefontsynonym [\s!SansBold] [Iwona-CapsBold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsBoldItalic] + \definefontsynonym [\s!Sans] [Iwona-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-Italic] + \definefontsynonym [\s!SansBold] [Iwona-Bold] + \definefontsynonym [\s!SansBoldItalic] [Iwona-BoldItalic] \stoptypescript \starttypescript [\s!sans] [iwona-medium] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-Medium-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-Medium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsMedium-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-medium-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsHeavy-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsMedium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsHeavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsHeavy-Italic] + \definefontsynonym [\s!Sans] [Iwona-Medium-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-Medium-Italic] + \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] + \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] \stoptypescript \starttypescript [\s!sans] [iwona-heavy] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-Heavy-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-Heavy-Italic] - \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsHeavy-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-heavy-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsHeavy-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] + \definefontsynonym [\s!Sans] [Iwona-Heavy-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-Heavy-Italic] + \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] + \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] \stoptypescript \starttypescript [\s!sans] [iwona-light-cond] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CondLight-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CondLight-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CondMedium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CondMedium-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsCondLight-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondLight-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondMedium-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondMedium-Italic] + \definefontsynonym [\s!Sans] [Iwona-CondLight-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-CondLight-Italic] + \definefontsynonym [\s!SansBold] [Iwona-CondMedium-Regular] + \definefontsynonym [\s!SansBoldItalic] [Iwona-CondMedium-Italic] \stoptypescript - \starttypescript [\s!sans] [iwona-light-cond-caps,iwona-light-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondLight-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondLight-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondMedium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondMedium-Italic] - \stoptypescript \starttypescript [\s!sans] [iwona-cond] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CondRegular] - \definefontsynonym [\s!SansItalic] [Iwona-CondItalic] - \definefontsynonym [\s!SansBold] [Iwona-CondBold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CondBoldItalic] - \definefontsynonym [SansCaps] [Iwona-CapsCondRegular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondBold] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondBoldItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-cond-caps,iwona-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondRegular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondItalic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondBold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondBoldItalic] + \definefontsynonym [\s!Sans] [Iwona-CondRegular] + \definefontsynonym [\s!SansItalic] [Iwona-CondItalic] + \definefontsynonym [\s!SansBold] [Iwona-CondBold] + \definefontsynonym [\s!SansBoldItalic] [Iwona-CondBoldItalic] \stoptypescript \starttypescript [\s!sans] [iwona-medium-cond] [\s!name] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CondMedium-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CondMedium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CondHeavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CondHeavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondMedium-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-medium-cond-caps,iwona-medium-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondMedium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondHeavy-Italic] + \definefontsynonym [\s!Sans] [Iwona-CondMedium-Regular] + \definefontsynonym [\s!SansItalic] [Iwona-CondMedium-Italic] + \definefontsynonym [\s!SansBold] [Iwona-CondHeavy-Regular] + \definefontsynonym [\s!SansBoldItalic] [Iwona-CondHeavy-Italic] \stoptypescript \starttypescript [iwona,iwona-light,iwona-heavy,iwona-medium] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv index e3e8fc277b4..da04010166a 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv @@ -134,11 +134,11 @@ \setupbodyfont[cows] -\input tufte +% \input tufte -\stoptext +% \stoptext -\starttext +% \starttext \loadtypescriptfile[cowotf] @@ -147,17 +147,17 @@ \definecolor[cowblue] [b=.50] \definecolor[cowyellow][y=.25] +\definefontcolorpalette[cows][cowgreen,cowyellow,cowblue,cowred] + \startluacode - fonts.handlers.otf.registerpalette("demo", { - { g = .50 }, - { y = .25 }, - { b = .50 }, - { r = .50 }, + fonts.handlers.otf.registerpalette("cows", { + { g = .5 }, + { r = .75, g = .75 }, + { b = .5 }, + { r = .5 }, }) \stopluacode -\definefontcolorpalette[cows][cowgreen,cowyellow,cowblue,cowred] - \adaptfontfeature[cowscolored] [colr=cows] \setupbodyfont[coloredcows,12pt] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv new file mode 100644 index 00000000000..472619cd953 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv @@ -0,0 +1,105 @@ +%D \module +%D [ file=type-kepler, +%D version=2021.11.16, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Kepler Opentype, +%D author=Mikael Sundqvist & Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% NOTA BENE: class features and goodies get expanded! + +\starttypescriptcollection[kpfonts-opentype] + + \doifunknownfontfeature {kp-sans-bold} {\definefontfeature[kp-sans-bold][boldened-15]} + + \starttypescript [\s!math] [kpfonts,kpfonts-nt,kpfonts-bold,kpfonts-light,kpfonts-sans] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + + \starttypescript [kpfonts,kpfonts-light,kpfonts-bold,kpfonts-sans,kpfonts-nt] + \loadfontgoodies[kpfonts-math] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] [\s!features=\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] [\s!features=\s!none] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + % for the moment here: + % \setupmathrendering[\typescriptone][\s!it=\s!italic] + \quittypescriptscanning + \stoptypescript + + \starttypescript [\s!serif] [kpfonts,kpfonts-sans,kpfonts-nt] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-SemiBold.otf] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-SemiboldItalic.otf] + \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] + \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] + \stoptypescript + + \starttypescript [\s!math] [kpfonts] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \stoptypescript + + \starttypescript [\s!math] [kpfonts-nt] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}] + \stoptypescript + + \starttypescript [\s!serif] [kpfonts-light] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Light.otf] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Regular.otf] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-LightItalic.otf] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-Italic.otf] + \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] + \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] + \stoptypescript + + \starttypescript [\s!math] [kpfonts-light] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Light.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \stoptypescript + + \starttypescript [\s!serif] [kpfonts-bold] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-Bold.otf] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-BoldItalic.otf] + \stoptypescript + + \starttypescript [\s!math] [kpfonts-bold] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \stoptypescript + + \starttypescript [\s!sans] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:KpSans-Regular.otf] + \definefontsynonym [\s!SansBold] [\s!file:KpSans-Bold.otf] + \definefontsynonym [\s!SansItalic] [\s!file:KpSans-Italic.otf] + \definefontsynonym [\s!SansBoldItalic] [\s!file:KpSans-BoldItalic.otf] + \stoptypescript + + \starttypescript [\s!math] [kpfonts-sans] + \definefontsynonym [\s!MathRoman] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kp-sans-bold,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math] + \stoptypescript + + \starttypescript [\s!mono] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [\s!file:KpMono-Regular.otf] + \definefontsynonym [\s!MonoBold] [\s!file:KpMono-Bold.otf] + \definefontsynonym [\s!MonoItalic] [\s!file:KpMono-Italic.otf] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:KpMono-BoldItalic.otf] + \stoptypescript + +\stoptypescriptcollection + +\endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kurier.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kurier.mkiv index d83510b95b5..0bf1a43cae0 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kurier.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-kurier.mkiv @@ -1,9 +1,9 @@ %D \module %D [ file=type-imp-kurier, -%D version=2007.07.30, +%D version=2021.10.24, %D title=\CONTEXT\ Typescript Macros, -%D subtitle=Kurier by JMN, -%D author=Hans Hagen, +%D subtitle=Kurier, +%D author=Hans Hagen & Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -11,33 +11,68 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% There are no open type fonts yet so this should be in type-one.mkiv -% instead but we keep it here till ready. +\starttypescriptcollection [kurier] -\starttypescriptcollection[kurier] + \definefontfeature[virtualmath-kurier] [virtualmath][virtualweight=kurier] + \definefontfeature[virtualmath-kurier-light] [virtualmath][virtualweight=kurier-light] + \definefontfeature[virtualmath-kurier-medium][virtualmath][virtualweight=kurier-medium] + \definefontfeature[virtualmath-kurier-heavy] [virtualmath][virtualweight=kurier-heavy] \starttypescript [\s!sans] [kurier-light,kurier,kurier-medium] - \definefontsynonym[Kurier-Light] [kurierl] - \definefontsynonym[Kurier-Regular] [kurierr] - \definefontsynonym[Kurier-Medium] [kurierm] - \definefontsynonym[Kurier-Bold] [kurierb] - \definefontsynonym[Kurier-Heavy] [kurierh] - \definefontsynonym[Kurier-LightItalic] [kurierli] - \definefontsynonym[Kurier-Italic] [kurierri] - \definefontsynonym[Kurier-MediumItalic] [kuriermi] - \definefontsynonym[Kurier-BoldItalic] [kurierbi] - \definefontsynonym[Kurier-HeavyItalic] [kurierhi] - \stoptypescript - - \starttypescript [\s!sans] [kurier-light] [\s!name] + \definefontsynonym [Kurier-Light] [\s!file:kurierlightregular] [\s!features=\s!default] + \definefontsynonym [Kurier-LightItalic] [\s!file:kurierlightitalic] [\s!features=\s!default] + \definefontsynonym [Kurier-Regular] [\s!file:kurierregular] [\s!features=\s!default] + \definefontsynonym [Kurier-Italic] [\s!file:kurieritalic] [\s!features=\s!default] + \definefontsynonym [Kurier-Medium] [\s!file:kuriermediumregular] [\s!features=\s!default] + \definefontsynonym [Kurier-MediumItalic] [\s!file:kuriermediumitalic] [\s!features=\s!default] + \definefontsynonym [Kurier-Bold] [\s!file:kurierbold] [\s!features=\s!default] + \definefontsynonym [Kurier-BoldItalic] [\s!file:kurierbolditalic] [\s!features=\s!default] + \definefontsynonym [Kurier-Heavy] [\s!file:kurierheavyregular] [\s!features=\s!default] + \definefontsynonym [Kurier-HeavyItalic] [\s!file:kurierheavyitalic] [\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!sans] [kurier-lightcond,kurier-cond,kurier-mediumcond] + \definefontsynonym [Kurier-CondLight] [\s!file:kuriercondlightregular] [\s!features=\s!default] + \definefontsynonym [Kurier-CondLightItalic] [\s!file:kuriercondlightitalic] [\s!features=\s!default] + \definefontsynonym [Kurier-CondRegular] [\s!file:kuriercondregular] [\s!features=\s!default] + \definefontsynonym [Kurier-CondItalic] [\s!file:kurierconditalic] [\s!features=\s!default] + \definefontsynonym [Kurier-CondMedium] [\s!file:kuriercondmediumregular] [\s!features=\s!default] + \definefontsynonym [Kurier-CondMediumItalic] [\s!file:kuriercondmediumitalic] [\s!features=\s!default] + \definefontsynonym [Kurier-CondBold] [\s!file:kuriercondbold] [\s!features=\s!default] + \definefontsynonym [Kurier-CondBoldItalic] [\s!file:kuriercondbolditalic] [\s!features=\s!default] + \definefontsynonym [Kurier-CondHeavy] [\s!file:kuriercondheavyregular] [\s!features=\s!default] + \definefontsynonym [Kurier-CondHeavyItalic] [\s!file:kuriercondheavyitalic] [\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!math][kurier][\s!all] + \definefontsynonym[\s!MathRoman] [kuriermath@kurier-math] + \definefontsynonym[\s!MathRomanBold][kuriermediummath@kurier-medium-math] + \stoptypescript + \starttypescript [\s!math][kurier-light][\s!all] + \definefontsynonym[\s!MathRoman][kurierlightmath@kurier-light-math] + \definefontsynonym[\s!MathRomanBold][kuriermath@kurier-math] + \stoptypescript + \starttypescript [\s!math][kurier-medium][\s!all] + \definefontsynonym[\s!MathRoman] [kuriermediummath@kurier-medium-math] + \definefontsynonym[\s!MathRomanBold][kurierheavymath@kurier-heavy-math] + \stoptypescript + \starttypescript [\s!math][kurier-heavy][\s!all] + \definefontsynonym[\s!MathRoman][kurierheavymath@kurier-heavy-math] + \stoptypescript + + \starttypescript [\s!math] [kurier,kurier-light,kurier-medium,kurier-heavy] [\s!all] + \loadfontgoodies[kurier-math] + \stoptypescript + + \starttypescript [\s!sans] [kurier-light] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Kurier-Light-Regular] - \definefontsynonym [\s!SansItalic] [Kurier-Light-Italic] - \definefontsynonym [\s!SansBold] [Kurier-Medium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Kurier-Medium-Italic] + \definefontsynonym [\s!Sans] [Kurier-Light] + \definefontsynonym [\s!SansItalic] [Kurier-LightItalic] + \definefontsynonym [\s!SansBold] [Kurier-Medium] + \definefontsynonym [\s!SansBoldItalic] [Kurier-MediumItalic] \stoptypescript - \starttypescript [\s!sans] [kurier] [\s!name] + \starttypescript [\s!sans] [kurier] \setups[\s!font:\s!fallback:\s!sans] \definefontsynonym [\s!Sans] [Kurier-Regular] \definefontsynonym [\s!SansItalic] [Kurier-Italic] @@ -45,12 +80,44 @@ \definefontsynonym [\s!SansBoldItalic] [Kurier-BoldItalic] \stoptypescript - \starttypescript [\s!sans] [kurier-medium] [\s!name] + \starttypescript [\s!sans] [kurier-medium] \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Kurier-Medium-Regular] - \definefontsynonym [\s!SansItalic] [Kurier-Medium-Italic] - \definefontsynonym [\s!SansBold] [Kurier-Heavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Kurier-Heavy-Italic] + \definefontsynonym [\s!Sans] [Kurier-Medium] + \definefontsynonym [\s!SansItalic] [Kurier-MediumItalic] + \definefontsynonym [\s!SansBold] [Kurier-Heavy] + \definefontsynonym [\s!SansBoldItalic] [Kurier-HeavyItalic] + \stoptypescript + + \starttypescript [\s!sans] [kurier-lightcond] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [Kurier-CondLight] + \definefontsynonym [\s!SansItalic] [Kurier-CondLightItalic] + \definefontsynonym [\s!SansBold] [Kurier-CondMedium] + \definefontsynonym [\s!SansBoldItalic] [Kurier-CondMediumItalic] + \stoptypescript + + \starttypescript [\s!sans] [kurier-cond] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [Kurier-CondRegular] + \definefontsynonym [\s!SansItalic] [Kurier-CondItalic] + \definefontsynonym [\s!SansBold] [Kurier-CondBold] + \definefontsynonym [\s!SansBoldItalic] [Kurier-CondBoldItalic] + \stoptypescript + + \starttypescript [\s!sans] [kurier-mediumcond] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [Kurier-CondMedium] + \definefontsynonym [\s!SansItalic] [Kurier-CondMediumItalic] + \definefontsynonym [\s!SansBold] [Kurier-CondHeavy] + \definefontsynonym [\s!SansBoldItalic] [Kurier-CondHeavyItalic] + \stoptypescript + + \starttypescript [kurier-light,kurier,kurier-medium,kurier-lightcond,kurier-cond,kurier-mediumcond] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default][text=ss] + \quittypescriptscanning \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv index dc31715a46a..f5082f7840a 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv @@ -71,7 +71,7 @@ \definefontsynonym [MonoVariable] [LMTypewriterVarWd-Regular] [\s!features=\s!none] \stoptypescript - \starttypescript [\s!math] [modern,latin-modern-designsize,latin-modern] [\s!name] + \starttypescript [\s!math] [modern,latin-modern-designsize,latin-modern,modern-nt] [\s!name] \loadfontgoodies[lm] \definefontsynonym [\s!MathRoman] [LMMathRoman-Regular] \definefontsynonym [\s!MathRomanBold] [LMMathRoman-Bold] @@ -173,16 +173,23 @@ \definefontsynonym [LMTypewriterVarWd-DarkOblique] [\s!file:lmmonoproplt10-boldoblique] [\s!features=\s!default] \stoptypescript -% \starttypescript [\s!math] [modern,latin-modern] -% \loadfontgoodies[lm] -% \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lm] -% \definefontsynonym [LMMathRoman-Bold] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lm] -% \stoptypescript + \starttypescript [\s!math] [modern,modern-nt,latin-modern,modern-designsize,modern-base,% + modernvariable,modern-variable,% + modernvariablelight,modern-variable-light,% + modern-mono,modern-base-mono] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50] + \stoptypescript \starttypescript [\s!math] [modern,latin-modern] \loadfontgoodies[lm] - \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,mathextra},\s!goodies=lm] - \definefontsynonym [LMMathRoman-Bold] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math-bold,lm-math,mathextra},\s!goodies=lm] + \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm:mathextra,lm-math,mathextra},\s!goodies=modern-math] + \definefontsynonym [LMMathRoman-Bold] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm:mathextra,lm-math-bold,lm-math,mathextra},\s!goodies=modern-math] + \stoptypescript + \starttypescript [\s!math] [modern-nt] + \loadfontgoodies[lm] + \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm:mathextra,lm-math,mathextra}] + \definefontsynonym [LMMathRoman-Bold] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm:mathextra,lm-math-bold,lm-math,mathextra}] \stoptypescript \starttypescript [modern-designsize-virtual] @@ -209,6 +216,14 @@ \quittypescriptscanning \stoptypescript + \starttypescript [modern-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [modern-nt] [\s!default] + \quittypescriptscanning + \stoptypescript + \starttypescript [modernvariable,modern-variable] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern-variable] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern-variable] [\s!default] @@ -235,7 +250,7 @@ %D It doesn't hurt to have these, at least for the moment (can go to type-imp-symbol) -\definefontsynonym [ZapfDingbats] [\s!file:uzdr*dingbats] % works better with symbols +\definefontsynonym [ZapfDingbats] [\s!file:uzdr*dingbats]% works better with symbols % \definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!features=dingbats]% [\s!goodies=dingbats] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv index 26d17bc03f2..97e3b3493f3 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv @@ -21,6 +21,8 @@ \starttypescriptcollection[libertinus] + \doifunknownfontfeature {libertinus-math-bold} {\definefontfeature[libertinus-math-bold][boldened]} + \starttypescript [\s!serif] [libertinus] \definefontsynonym [LibertinusSerif-Regular] [\s!file:libertinusserif-regular] \definefontsynonym [LibertinusSerif-Italic] [\s!file:libertinusserif-italic] @@ -71,16 +73,28 @@ \definefontsynonym [\s!Mono] [LibertinusMono-Regular] [\s!features=\s!none] \stoptypescript + \starttypescript [\s!math] [libertinus,libertinus-nt] + \checkedmapfontsize[\typescripttwo][\s!script] [.80] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.60] + \stoptypescript + \starttypescript [\s!math] [libertinus] [\s!name] - \definefontsynonym[\s!MathRoman ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] - \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] + \loadfontgoodies[libertinus-math] + \definefontsynonym[\s!MathRoman ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus:mathextra,mathextra},\s!goodies=libertinus-math.lfg] + \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus-math-bold,libertinus:mathextra,mathextra},\s!goodies=libertinus-math.lfg] + \stoptypescript + + \starttypescript [\s!math] [libertinus-nt] [\s!name] + \loadfontgoodies[libertinus-math] + \definefontsynonym[\s!MathRoman ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus-math-bold,libertinus:mathextra,mathextra}] \stoptypescript - \starttypescript [libertinus] - \definetypeface [libertinus] [\s!rm] [\s!serif] [libertinus] [\s!default] - \definetypeface [libertinus] [\s!ss] [\s!sans] [libertinus] [\s!default] - \definetypeface [libertinus] [\s!tt] [\s!mono] [libertinus] [\s!default] - \definetypeface [libertinus] [\s!mm] [\s!math] [libertinus] [\s!default] + \starttypescript [libertinus,libertinus-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [libertinus] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [libertinus] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [libertinus] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \quittypescriptscanning \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida.mkiv index 61002ff0631..186854efcf3 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-lucida.mkiv @@ -13,9 +13,17 @@ % NOTA BENE: class features and goodies get expanded! +\definefontfeature[mathlucida][copymathscripts=yes] % see lfg file + +% \definefontfeature[mathlucida][mathlucida][ss04=yes] % now we swap + +% \definefontfeature[mathlucida][ss03=yes] + \starttypescriptcollection[lucida-opentype] - \starttypescript [lucidaot,lucidadk] + \doifunknownfontfeature {lucida-math-bold} {\definefontfeature[lucida-math-bold][boldened][boldmath=yes]} + + \starttypescript [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] \loadfontgoodies[lucida-opentype-math] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] [\s!features=\s!default] @@ -23,12 +31,10 @@ \definetypeface [\typescriptone] [\s!hw] [\s!handwriting] [\typescriptone] [\s!default] [\s!features=\s!default] \definetypeface [\typescriptone] [\s!cg] [\s!calligraphy] [\typescriptone] [\s!default] [\s!features=\s!default] \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] - % for the moment here: - \setupmathrendering[\typescriptone][\s!it=\s!italic] \quittypescriptscanning \stoptypescript - \starttypescript [\s!serif] [lucidaot,lucidadk] + \starttypescript [\s!serif] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Serif] [\s!file:LucidaBrightOT.otf] \definefontsynonym [\s!SerifBold] [\s!file:LucidaBrightOT-Demi.otf] \definefontsynonym [\s!SerifItalic] [\s!file:LucidaBrightOT-Italic.otf] @@ -37,7 +43,7 @@ \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] \stoptypescript - \starttypescript [\s!sans] [lucidaot,lucidadk] + \starttypescript [\s!sans] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Sans] [\s!file:LucidaSansOT.otf] \definefontsynonym [\s!SansBold] [\s!file:LucidaSansOT-Demi.otf] \definefontsynonym [\s!SansItalic] [\s!file:LucidaSansOT-Italic.otf] @@ -46,7 +52,7 @@ \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic] \stoptypescript - \starttypescript [\s!mono] [lucidaot] + \starttypescript [\s!mono] [lucida,lucidaot,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Mono] [\s!file:LucidaSansTypewriterOT.otf] \definefontsynonym [\s!MonoBold] [\s!file:LucidaSansTypewriterOT-Bold.otf] \definefontsynonym [\s!MonoItalic] [\s!file:LucidaSansTypewriterOT-Oblique.otf] @@ -55,7 +61,7 @@ \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic] \stoptypescript - \starttypescript [\s!mono] [lucidadk] + \starttypescript [\s!mono] [lucidadk,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Mono] [\s!file:LucidaGrandeMonoDK.otf] \definefontsynonym [\s!MonoBold] [\s!file:LucidaGrandeMonoDK-Bold.otf] \definefontsynonym [\s!MonoItalic] [\s!file:LucidaGrandeMonoDK-Oblique.otf] @@ -64,16 +70,28 @@ \definefontsynonym [\s!MonoBoldSlanted] [\s!MonoBoldItalic] \stoptypescript - \starttypescript [\s!math] [lucidaot,lucidadk] - \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math] + \starttypescript [\s!math] [lucida,lucida-nt,lucidaot,lucidaot-nt,lucidadk] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50] + \stoptypescript + + \starttypescript [\s!math] [lucida,lucidaot,lucidadk] + \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] + % \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] + \stoptypescript + + \starttypescript [\s!math] [lucidaot-nt,lucida-nt] + \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra}] +% \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra}] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra}] \stoptypescript - \starttypescript [\s!handwriting] [lucidaot,lucidadk] + \starttypescript [\s!handwriting] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Handwriting] [\s!file:LucidaHandwritingOT.otf] \stoptypescript - \starttypescript [\s!calligraphy] [lucidaot,lucidadk] + \starttypescript [\s!calligraphy] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] \definefontsynonym [\s!Calligraphy] [\s!file:LucidaCalligraphyOT.otf] \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-minion.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-minion.mkiv index b158deddfb8..aa953623c9b 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-minion.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-minion.mkiv @@ -11,8 +11,8 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\definefontfallback[MinionMathFallback] [file:latinmodern-math.otf][uppercasescript] -\definefontfallback[MinionBoldMathFallback][file:latinmodern-math.otf][uppercasescript] +% \definefontfallback[MinionMathFallback] [file:latinmodern-math.otf][uppercasescript] +% \definefontfallback[MinionBoldMathFallback][file:latinmodern-math.otf][uppercasescript] \starttypescriptcollection[minion] @@ -34,14 +34,14 @@ \starttypescript [\s!math][minion][\s!all] \loadfontgoodies[minion-math] - \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback] - \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback] + \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math] % ,\s!fallbacks=MinionMathFallback] + \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math] % ,\s!fallbacks=MinionBoldMathFallback] \stoptypescript \starttypescript [\s!math][minion-medium][\s!all] \loadfontgoodies[minion-math] - \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback] - \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback] + \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math] % ,\s!fallbacks=MinionMathFallback] + \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math] % ,\s!fallbacks=MinionBoldMathFallback] \stoptypescript \starttypescript [minion,minion-medium] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv index e3417fca557..c10ffa54ef0 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv @@ -22,7 +22,7 @@ \doifunknownfontfeature {lm-math-regular} {\definefontfeature[lm-math-regular] [boldened-15]} \doifunknownfontfeature {lm-math-bold} {\definefontfeature[lm-math-bold] [boldened-30]} - \starttypescript [\s!serif] [modern-latin] + \starttypescript [\s!serif] [modernlatin,modern-latin] % \loadfontgoodies[lm] \definefontsynonym [Serif] [\s!file:lmroman10-regular] [\s!features={\s!default,lm-serif-regular}] \definefontsynonym [SerifItalic] [\s!file:lmroman10-italic] [\s!features={\s!default,lm-serif-regular}] @@ -32,7 +32,17 @@ \definefontsynonym [SerifBoldSlanted][\s!file:lmromanslant10-regular] [\s!features={\s!default,lm-serif-bold}] \stoptypescript - \starttypescript [\s!sans] [modern-latin] + \starttypescript [\s!serif] [lessmodernlatin,less-modern-latin] + % \loadfontgoodies[lm] + \definefontsynonym [Serif] [\s!file:lmroman10-regular] [\s!features={\s!default,lm-serif-regular}] + \definefontsynonym [SerifItalic] [\s!file:lmroman10-italic] [\s!features={\s!default,lm-serif-regular}] + \definefontsynonym [SerifSlanted] [\s!file:lmromanslant10-regular] [\s!features={\s!default,lm-serif-regular}] + \definefontsynonym [SerifBold] [\s!file:lmroman10-bold] [\s!features={\s!default,lm-serif-regular}] + \definefontsynonym [SerifBoldItalic] [\s!file:lmroman10-bolditalic] [\s!features={\s!default,lm-serif-regular}] + \definefontsynonym [SerifBoldSlanted][\s!file:lmromanslant10-bold] [\s!features={\s!default,lm-serif-regular}] + \stoptypescript + + \starttypescript [\s!sans] [modernlatin,modern-latin] % \loadfontgoodies[lm] \definefontsynonym [Sans] [\s!file:lmsans10-regular] [\s!features={\s!default,lm-sans-regular}] \definefontsynonym [SansItalic] [\s!file:lmsans10-oblique] [\s!features={\s!default,lm-sans-regular}] @@ -42,7 +52,17 @@ \definefontsynonym [SansBoldSlanted][\s!file:lmsans10-oblique] [\s!features={\s!default,lm-sans-bold}] \stoptypescript - \starttypescript [\s!mono] [modern-latin] + \starttypescript [\s!sans] [lessmodernlatin,less-modern-latin] + % \loadfontgoodies[lm] + \definefontsynonym [Sans] [\s!file:lmsans10-regular] [\s!features={\s!default,lm-sans-regular}] + \definefontsynonym [SansItalic] [\s!file:lmsans10-oblique] [\s!features={\s!default,lm-sans-regular}] + \definefontsynonym [SansSlanted] [\s!file:lmsans10-boldoblique] [\s!features={\s!default,lm-sans-regular}] + \definefontsynonym [SansBold] [\s!file:lmsans10-bold] [\s!features={\s!default,lm-sans-regular}] + \definefontsynonym [SansBoldItalic] [\s!file:lmsans10-boldoblique] [\s!features={\s!default,lm-sans-regular}] + \definefontsynonym [SansBoldSlanted][\s!file:lmsans10-boldoblique] [\s!features={\s!default,lm-sans-regular}] + \stoptypescript + + \starttypescript [\s!mono] [modernlatin,modern-latin] % \loadfontgoodies[lm] \definefontsynonym [Mono] [\s!file:lmmono10-regular] [\s!features={\s!default,lm-mono-regular}] \definefontsynonym [MonoItalic] [\s!file:lmmono10-italic] [\s!features={\s!default,lm-mono-regular}] @@ -52,17 +72,27 @@ \definefontsynonym [MonoBoldSlanted][\s!file:lmmonoslant10-regular] [\s!features={\s!default,lm-mono-bold}] \stoptypescript - \starttypescript [\s!math] [modern-latin] - \loadfontgoodies[lm] - \definefontsynonym [MathRoman] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,oldmath,lm-math-regular,mathextra},\s!goodies=lm] - \definefontsynonym [MathRomanBold] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,oldmath,lm-math-bold,mathextra},\s!goodies=lm] + \starttypescript [\s!mono] [lessmodernlatin,less-modern-latin] + % \loadfontgoodies[lm] + \definefontsynonym [Mono] [\s!file:lmmono10-regular] [\s!features={\s!default,lm-mono-regular}] + \definefontsynonym [MonoItalic] [\s!file:lmmono10-italic] [\s!features={\s!default,lm-mono-regular}] + \definefontsynonym [MonoSlanted] [\s!file:lmmonoslant10-regular] [\s!features={\s!default,lm-mono-regular}] + \definefontsynonym [MonoBold] [\s!file:lmmono10-bold] [\s!features={\s!default,lm-mono-regular}] + \definefontsynonym [MonoBoldItalic] [\s!file:lmmono10-bolditalic] [\s!features={\s!default,lm-mono-regular}] + \definefontsynonym [MonoBoldSlanted][\s!file:lmmonoslant10-regular] [\s!features={\s!default,lm-mono-bold}] + \stoptypescript + + \starttypescript [\s!math] [modernlatin,modern-latin,lessmodernlatin,less-modern-latin] + \loadfontgoodies[modern-math] + \definefontsynonym [MathRoman] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm-math,lm-math-regular,mathextra},\s!goodies=modern-math] + \definefontsynonym [MathRomanBold] [\v!file:latinmodern-math.otf] [\s!features={\s!math\mathsizesuffix,lm-math,lm-math-bold,mathextra},\s!goodies=modern-math] \stoptypescript - \starttypescript [modern-latin,modernlatin] - \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern-latin] [\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern-latin] [\s!default] - \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern-latin] [\s!default] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [modern-latin] [\s!default] + \starttypescript [modern-latin,modernlatin,less-modern-latin,lessmodernlatin] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \quittypescriptscanning \stoptypescript diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv new file mode 100644 index 00000000000..65a84ec5fe2 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv @@ -0,0 +1,93 @@ +%D \module +%D [ file=type-imp-newcomputermodern, +%D version=2021.06.08, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=NewComputerModern, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D There is something fishy with the books fonts. The otf files are twice as large +%D as the normal ones but the tma's we filter from it are pretty close (mostly +%D boundingbox differences). The streams are also of similar size so there must be +%D something extra in there. + +% \definefontfallback[Serif] [file:notoserif-regular.ttf] [0x0000-0xFFFF] [check=yes,rscale=1.02] +% \definefontfallback[SerifBold][file:notoserif-bold.ttf] [0x0000-0xFFFF] [check=yes,rscale=1.02] + +\starttypescriptcollection[newcomputermodern] + + \doifunknownfontfeature {newcomputermodern-math-bold} {\definefontfeature[newcomputermodern-math-bold][boldened]} + + \starttypescript [\s!serif] [newcomputermodern] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [\s!file:newcm10-regular.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif] + \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold] + \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-italic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic] + \stoptypescript + + \starttypescript [\s!sans] [newcomputermodern] [\s!name] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:newcmsans10-regular.otf] [\s!features=\s!default,\s!fallbacks=\s!Sans] + \definefontsynonym [\s!SansBold] [\s!file:newcmsans10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SansBold] + \definefontsynonym [\s!SansItalic] [\s!file:newcmsans10-oblique.otf] [\s!features=\s!default,\s!fallbacks=\s!SansItalic] + \definefontsynonym [\s!SansBoldItalic] [\s!file:newcmsans10-boldoblique.otf] [\s!features=\s!default,\s!fallbacks=\s!SansBoldItalic] + \stoptypescript + + \starttypescript [\s!mono] [newcomputermodern] [\s!name] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [\s!file:newcmmono10-regular.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] + \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-italic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] + \stoptypescript + + \starttypescript [\s!math][newcomputermodern] [\s!name] + % \loadfontgoodies[newcomputermodern-math] ,\s!goodies=newcomputermodern-math + \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-regular][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-regular][\s!features={\s!math\mathsizesuffix,newcomputermodern-math-bold,mathextra},\s!goodies=newcomputermodern-math] + \stoptypescript + + \starttypescript [\s!serif] [newcomputermodern-book] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym [\s!Serif] [\s!file:newcm10-book.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif] + \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold] + \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-bookitalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic] + \stoptypescript + + \starttypescript [\s!sans] [newcomputermodern-book] [\s!name] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:newcmsans10-book.otf] [\s!features=\s!default,\s!fallbacks=\s!Sans] + \definefontsynonym [\s!SansBold] [\s!file:newcmsans10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SansBold] + \definefontsynonym [\s!SansItalic] [\s!file:newcmsans10-bookoblique.otf] [\s!features=\s!default,\s!fallbacks=\s!SansItalic] + \definefontsynonym [\s!SansBoldItalic] [\s!file:newcmsans10-boldoblique.otf] [\s!features=\s!default,\s!fallbacks=\s!SansBoldItalic] + \stoptypescript + + \starttypescript [\s!mono] [newcomputermodern-book] [\s!name] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [\s!file:newcmmono10-book.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] + \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-bookitalic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] + \stoptypescript + + \starttypescript [\s!math][newcomputermodern-book] [\s!name] + % \loadfontgoodies[newcomputermodern-math] ,\s!goodies=newcomputermodern-math + \definefontsynonym[\s!MathRoman] [\s!file:newcmmath-book][\s!features={\s!math\mathsizesuffix,newcm-mathextra,mathextra},\s!goodies=newcomputermodern-math] + \definefontsynonym[\s!MathRomanBold][\s!file:newcmmath-book][\s!features={\s!math\mathsizesuffix,newcm-mathextra,newcomputermodern-math-bold,mathextra},\s!goodies=newcomputermodern-math] + \stoptypescript + + \starttypescript[newcomputermodern,newcomputermodern-book] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv index ee11d83899c..3ac0b72572d 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -13,64 +13,67 @@ %D We provide typescripts for version one and two of the stix fonts. There is a %D xits variant based on the first (not opentype) release that also provides -%D bidirectional math. +%D bidirectional math. With (in 2022) stixtwo being frozsen for 2 years we can make +%D these the default now. %D %D Users should be aware of the fact that the stix filenames keep changing so if %D something fails, make sure you have the files and that the names below match -%D those on your system. (In \TEX\ distributions there's 2 and Two and math can have -%D -Regular appended or not. +%D those on your system. In \TEX\ distributions there's 2 and Two and math can have +%D -Regular appended or not. You can expect the \CONTEXT\ distribution to be kept up +%D to date. %D -%D There's now also: -%D -%D stixtwotext-medium.otf -%D stixtwotext-mediumitalic.otf -%D stixtwotext-semibold.otf -%D stixtwotext-semibolditalic.otf +%D Per november 2022 we swithched from \OPENTYPE\ (otf) files to \TRUETYPE\ (ttf) +%D files. The main reason is that the metrics are cleaner, especially when one peeks +%D into the font for the purpose tweaking math (boundingbox, true positioning +%D unaffected by excessive hinting shown in in FontForge). It is yet unclear to us +%D (MS & HH) why there is this difference, but it might relate to the toolchain used +%D for generating these fonts. We might even switch to (smaller) unhinted \TRUETYPE\ +%D fonts at some point but then we need to generate them ourselves). Anyway, the end +%D results are the same but we just want to be able to view it right. \definefontfeature [stixtwomath] [ss02=yes] % otherwise weird (non italic) g -\starttypescriptcollection[stix] +\definefontfeature[stixtwomath][copymathscripts=yes] % see lfg file - % version one +\starttypescriptcollection[stix] - \starttypescript [\s!math] [stix] [\s!name] - \definefontsynonym[MathRoman][\s!file:stixmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] - \stoptypescript + \doifunknownfontfeature {stixtwo-math-bold} {\definefontfeature[stixtwo-math-bold][boldened]} - \starttypescript [\s!serif] [stix] [\s!name] - \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym[\s!Serif] [\s!file:stix-regular.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBold] [\s!file:stix-bold.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifItalic] [\s!file:stix-italic.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBoldItalic][\s!file:stix-bolditalic.otf][\s!features=\s!default] + \starttypescript [\s!math] [stix,stixtwo,stix-nt,stixtwo-nt,xits] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] \stoptypescript - \starttypescript[stix] - \definetypeface [stix] [\s!rm] [\s!serif] [stix] [\s!default] - \definetypeface [stix] [\s!mm] [\s!math] [stix] [\s!default] + \starttypescript [\s!math] [stix,stixtwo,xits] [\s!name] + \definefontsynonym[\s!MathRoman] [\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwomath,stixtwo:mathextra,mathextra},\s!goodies=stixtwo-math] + \definefontsynonym[\s!MathRomanBold][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwo-math-bold,stixtwomath,stixtwo:mathextra,mathextra},\s!goodies=stixtwo-math] \stoptypescript - % version two - - \starttypescript [\s!math] [stixtwo] [\s!name] - \definefontsynonym[MathRoman][\s!file:stixtwomath-regular.otf] [\s!features={\s!math\mathsizesuffix,stixtwomath,mathextra},\s!goodies=stix-two-math] + \starttypescript [\s!math] [stix-nt,stixtwo-nt] [\s!name] + \definefontsynonym[\s!MathRoman][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwomath,stixtwo:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwo-math-bold,stixtwomath,stixtwo:mathextra,mathextra}] \stoptypescript - \starttypescript [\s!serif] [stixtwo] [\s!name] + \starttypescript [\s!serif] [stix,stixtwo,xits] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym[\s!Serif] [\s!file:stixtwotext-regular.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBold] [\s!file:stixtwotext-bold.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifItalic] [\s!file:stixtwotext-italic.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBoldItalic][\s!file:stixtwotext-bolditalic.otf][\s!features=\s!default] + \definefontsynonym[\s!Serif] [\s!file:stixtwotext-regular.ttf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBold] [\s!file:stixtwotext-bold.ttf] [\s!features=\s!default] + \definefontsynonym[\s!SerifItalic] [\s!file:stixtwotext-italic.ttf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBoldItalic][\s!file:stixtwotext-bolditalic.ttf][\s!features=\s!default] \stoptypescript - \starttypescript[stixtwo] - \definetypeface [\typescriptone] [\s!rm] [\s!serif] [stixtwo] [\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!serif] [stixtwo] [\s!default] - \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.895] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [stixtwo] [\s!default] + \starttypescript[stix,stixtwo,xits,stix-nt,stixtwo-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [stixtwo] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!serif] [stixtwo] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.895] + \stoptypescript + \starttypescript[stix,stixtwo,xits] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [stixtwo] [\s!default] [\s!direction=\s!both] + \stoptypescript + \starttypescript[stix-nt,stixtwo-nt] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [stixtwo-nt] [\s!default] [\s!direction=\s!both] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv index 01cbb869df7..a3f3952c787 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv @@ -1,4 +1,4 @@ -%D \module + %D \module %D [ file=type-imp-texgyre, %D version=2007.07.30, %D title=\CONTEXT\ Typescript Macros, @@ -21,9 +21,7 @@ %D around but I won't waste time on sorting out all the (changing) font hassles. Also, %D the T1 fonts involved are unlikely to be available. -\definefontfeature - [mathcollapseitalics] - [collapseitalics=yes] +% \definefontfeature[mathextra][collapseitalics] \starttypescriptcollection[texgyre] @@ -165,37 +163,61 @@ % caps: \definetypeface [pagella] [rm] [serif] [pagella-caps] [default] - \starttypescript [times,termes] + \starttypescript [termes,termes-nt,times] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [helvetica] [\s!default] [\s!rscale=0.9] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] [\s!rscale=1.05] + \stoptypescript + \starttypescript [termes,times] \definetypeface [\typescriptone] [\s!mm] [\s!math] [termes] [\s!default] \quittypescriptscanning \stoptypescript + \starttypescript [termes-nt] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [termes-nt] [\s!default] + \quittypescriptscanning + \stoptypescript - \starttypescript [palatino,pagella] + \starttypescript [pagella,pagella-nt,palatino] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern] [\s!default] [\s!rscale=1.075] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] [\s!rscale=1.075] + \stoptypescript + \starttypescript [pagella,palatino] \definetypeface [\typescriptone] [\s!mm] [\s!math] [pagella] [\s!default] \quittypescriptscanning \stoptypescript + \starttypescript [pagella-nt] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [pagella-nt] [\s!default] + \quittypescriptscanning + \stoptypescript - \starttypescript [schoolbook,schola] + \starttypescript [schola,schola-nt,schoolbook] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern] [\s!default] [\s!rscale=1.1] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] [\s!rscale=1.1] + \stoptypescript + \starttypescript [schola,schoolbook] \definetypeface [\typescriptone] [\s!mm] [\s!math] [schola] [\s!default] \quittypescriptscanning \stoptypescript + \starttypescript [schola-nt] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [schola-nt] [\s!default] + \quittypescriptscanning + \stoptypescript - \starttypescript [bookman,bonum] + \starttypescript [bonum,bonum-nt,bookman] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!ss] [\s!sans] [modern] [\s!default] [\s!rscale=1.1] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] [\s!rscale=1.1] + \stoptypescript + \starttypescript [bookman,bonum] \definetypeface [\typescriptone] [\s!mm] [\s!math] [bonum] [\s!default] \quittypescriptscanning \stoptypescript + \starttypescript [bonum-nt] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [bonum-nt] [\s!default] + \quittypescriptscanning + \stoptypescript \starttypescript [chancery,chorus] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] @@ -231,13 +253,20 @@ \stoptypescriptcollection -% tricky: we cannot mix now as the file is loaded only once +% We no longer support tx and px in LMTX. These fonts were used in the transition from +% traditional (type one) fonts to the new gyre fonts. The LMTX distribution no longer +% ships these fonts anyway. + +\ifcase\contextlmtxmode \else + \disablemode[pxmath] + \disablemode[txmath] +\fi \startmode[txmath] - \starttypescriptcollection[texgyre-math-times] + \starttypescriptcollection[texgyre-math-termes] - \starttypescript [\s!math][times,termes][\s!all] + \starttypescript [\s!math][termes,times][\s!all] \loadfontgoodies[tx-math] \definefontsynonym[\s!MathRoman][txmath@tx-math] % \definefontsynonym[\s!MathRomanBold][MathRoman] @@ -249,13 +278,19 @@ \startnotmode[txmath] - \starttypescriptcollection[texgyre-math-times] + \starttypescriptcollection[texgyre-math-termes] - \starttypescript [\s!math][times,termes][\s!all] - % \loadfontgoodies[texgyre] - % \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre] - \definefontsynonym[\s!MathRoman] [file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=termes-math] - \definefontsynonym[\s!MathRomanBold][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes-math-bold,mathextra},\s!goodies=termes-math] + \starttypescript [\s!math][termes,termes-nt,times][\s!all] + \checkedmapfontsize[\typescripttwo][\s!script] [.70]%.74 + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50]%.55 + \stoptypescript + \starttypescript [\s!math][termes,times][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes:mathextra,mathextra},\s!goodies=termes-math] + \definefontsynonym[\s!MathRomanBold][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes:mathextra,termes-math-bold,mathextra},\s!goodies=termes-math] + \stoptypescript + \starttypescript [\s!math][termes-nt][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes:mathextra,termes-math-bold,mathextra}] \stoptypescript \stoptypescriptcollection @@ -280,11 +315,17 @@ \starttypescriptcollection[texgyre-math-pagella] - \starttypescript [\s!math][palatino,pagella][\s!all] - % \loadfontgoodies[texgyre] - % \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre] - \definefontsynonym[\s!MathRoman] [file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=pagella-math] - \definefontsynonym[\s!MathRomanBold][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella-math-bold,mathextra},\s!goodies=pagella-math] + \starttypescript [\s!math][pagella,pagella-nt,palatino]% [\s!all] + \checkedmapfontsize[\typescripttwo][\s!script] [.74] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + \starttypescript [\s!math][pagella,palatino][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella:mathextra,mathextra},\s!goodies=pagella-math] + \definefontsynonym[\s!MathRomanBold][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella:mathextra,pagella-math-bold,mathextra},\s!goodies=pagella-math] + \stoptypescript + \starttypescript [\s!math][pagella-nt][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella:mathextra,pagella-math-bold,mathextra}] \stoptypescript \stoptypescriptcollection @@ -293,22 +334,34 @@ \starttypescriptcollection[texgyre-math-bonum] - \starttypescript [\s!math][bookman,bonum][\s!all] - % \loadfontgoodies[texgyre] - % \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre] - \definefontsynonym[\s!MathRoman] [file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=bonum-math] - \definefontsynonym[\s!MathRomanBold][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum-math-bold,mathextra},\s!goodies=bonum-math] + \starttypescript [\s!math][bonum,bonum-nt,bookman][\s!all] + \checkedmapfontsize[\typescripttwo][\s!script] [.70]%.77 + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55]%.60 + \stoptypescript + \starttypescript [\s!math][bonum,bookman][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum:mathextra,mathextra},\s!goodies=bonum-math] + \definefontsynonym[\s!MathRomanBold][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum:mathextra,bonum-math-bold,mathextra},\s!goodies=bonum-math] + \stoptypescript + \starttypescript [\s!math][bonum-nt][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum:mathextra,bonum-math-bold,mathextra}] \stoptypescript \stoptypescriptcollection \starttypescriptcollection[texgyre-math-schola] - \starttypescript [\s!math][schoolbook,schola][\s!all] - % \loadfontgoodies[texgyre] - % \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre] - \definefontsynonym[\s!MathRoman] [file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=schola-math] - \definefontsynonym[\s!MathRomanBold][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola-math-bold,mathextra},\s!goodies=schola-math] + \starttypescript [\s!math][schola,schola-nt,schoolbook][\s!all] + \checkedmapfontsize[\typescripttwo][\s!script] [.77] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.60] + \stoptypescript + \starttypescript [\s!math][schola,schoolbook][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola:mathextra,mathextra},\s!goodies=schola-math] + \definefontsynonym[\s!MathRomanBold][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola:mathextra,schola-math-bold,mathextra},\s!goodies=schola-math] + \stoptypescript + \starttypescript [\s!math][schola-nt][\s!all] + \definefontsynonym[\s!MathRoman] [file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola:mathextra,mathextra}] + \definefontsynonym[\s!MathRomanBold][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola:mathextra,schola-math-bold,mathextra}] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-unfonts.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-unfonts.mkiv index 91ae3b2300f..1c8b2c3c531 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-unfonts.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-unfonts.mkiv @@ -14,7 +14,7 @@ % usage: \setupbodyfont[unfonts] \loadtypescriptfile[texgyre] -\loadtypescriptfile[xits] +%\loadtypescriptfile[xits] \definefontfeature [kr-default] @@ -136,7 +136,7 @@ \definetypeface [unfonts] [\s!rm] [\s!serif] [unbatang] \definetypeface [unfonts] [\s!ss] [\s!sans] [undotum] \definetypeface [unfonts] [\s!tt] [\s!mono] [untype] - \definetypeface [unfonts] [\s!mm] [\s!math] [xits] + \definetypeface [unfonts] [\s!mm] [\s!math] [pagella] \stoptypescript \stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv new file mode 100644 index 00000000000..6b6e5fc4e5f --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xcharter.mkiv @@ -0,0 +1,67 @@ +%D \module +%D [ file=type-imp-xcharter, +%D version=2022.30.09, % a bit older +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=XCharter fonts, +%D author=Mikael Sundqvist, +%D date=\currentdate, +%D copyright={\CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\starttypescriptcollection[xcharter] + + % \definefontfeature[default-slanted-xcharter][default][slant=.2] + % \definefontfeature[none-slanted-xcharter] [none] [slant=.2] + + \doifunknownfontfeature {xcharter-math-bold} {\definefontfeature[xcharter-math-bold][boldened]} + + \starttypescript [\s!serif] [xcharter] [\s!name] + \definefontsynonym [\s!Serif] [\s!file:XCharter-Roman] [\s!features=\s!default] + \definefontsynonym [\s!SerifItalic] [\s!file:XCharter-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SerifSlanted] [\s!file:XCharter-Slanted] [\s!features=\s!default] + \definefontsynonym [\s!SerifBold] [\s!file:XCharter-Bold] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:xcharter-BoldItalic] [\s!features=\s!default] + \definefontsynonym [\s!SerifBoldSlanted][\s!file:XCharter-BoldSlanted][\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!sans] [cabin] [\s!name] + \setups[\s!font:\s!fallback:\s!sans] + \definefontsynonym [\s!Sans] [\s!file:Cabin-Regular] [\s!features=\s!default] + \definefontsynonym [\s!SansItalic] [\s!file:Cabin-Italic] [\s!features=\s!default] + \definefontsynonym [\s!SansBold] [\s!file:Cabin-SemiBold] [\s!features=\s!default] + \definefontsynonym [\s!SansBoldItalic][\s!file:Cabin-SemiBoldItalic][\s!features=\s!default] + \stoptypescript + + \starttypescript [\s!mono] [inconsolata] [\s!name] + \setups[\s!font:\s!fallback:\s!mono] + \definefontsynonym [\s!Mono] [\s!file:Inconsolatazi4-Regular][\s!features=\s!none] + \definefontsynonym [\s!MonoBold][\s!file:Inconsolatazi4-Bold] [\s!features=\s!none] + \stoptypescript + + \starttypescript [\s!math] [xcharter,xcharter-nt][\s!name] + \checkedmapfontsize[\typescripttwo][\s!script] [.70] + \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55] + \stoptypescript + + \starttypescript [\s!math] [xcharter][\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra},\s!goodies=xcharter-math] + \definefontsynonym [\s!MathRomanBold][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter-math-bold,xcharter:mathextra,mathextra},\s!goodies=xcharter-math] + \stoptypescript + + \starttypescript [\s!math] [xcharter-nt] [\s!name] + \definefontsynonym [\s!MathRoman] [\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra}] + \definefontsynonym [\s!MathRomanBold][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter-math-bold,xcharter:mathextra,mathextra}] + \stoptypescript + + \starttypescript [xcharter,xcharter-nt] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [xcharter] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [cabin] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [inconsolata] [\s!default] [\s!rscale=1.1] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] + \quittypescriptscanning + \stoptypescript + +\stoptypescriptcollection diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xits.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xits.mkiv index d3504bdbb35..4051f961807 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xits.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-xits.mkiv @@ -17,18 +17,25 @@ % scheduled for release by the end of 2010. Version 1.2, which will include Type 1 % fonts for use with LaTeX, will follow in 2011. So, we are on our own anyway. +% In \MKXL\ (aka LMTX) we now use StixTwo because Xits is frozen and not maintained +% any longer. The obsolete LR2 and R2L variants are just ignored because in \LMTX\ +% all math fonts have bidi support injected for which we use a companion font that is +% derived from Xits. + +\definefontfeature[xitsmath][copymathscripts=yes] % see lfg file + \loadtypescriptfile[texgyre] \starttypescriptcollection[xits] \starttypescript [\s!math] [xits,xitsbidi] [\s!name] \loadfontgoodies[xits-math] - \definefontsynonym[\s!MathRoman ][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRoman L2R][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRoman R2L][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold ][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold L2R][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold R2L][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman ][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix ,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman L2R][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman R2L][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold ][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix ,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold L2R][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold R2L][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra,xitsmath},\s!goodies=xits-math] \stoptypescript \starttypescript [\s!serif] [xits] [\s!name] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg new file mode 100644 index 00000000000..1ff5d41d8b6 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/xcharter-math.lfg @@ -0,0 +1,104 @@ +-- This font is under active development so we don't want to tweek it too much +-- before all issues are sorted out. + +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets + +return { + name = "xcharter-math", + version = "1.00", + comment = "Goodies that complement xcharter math.", + author = "Hans Hagen & Mikael Sundqvist", + copyright = "ConTeXt development team", + mathematics = { + parameters = { + SubscriptShiftDown = 200, -- 300 in font + SubscriptShiftDownWithSuperscript = "1.3*SubscriptShiftDown", -- 1.5* in math-act + PrimeShiftUp = "1.2*SuperscriptShiftUp", + PrimeShiftUpCramped = "1.2*SuperscriptShiftUp", + PrimeBaselineDropMax = "0.5*SuperscriptBaselineDropMax", + }, + tweaks = { + aftercopying = { + { + tweak = "fixprimes", + factor = 0.92, + }, + { + tweak = "addmirrors", + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.90 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x002F] = { topleft = -0.15, bottomright = -0.15 }, + ["0x7D.parts.top"] = { topright = -0.15, }, -- right brace top + ["0x7D.parts.bottom"] = { bottomright = -0.15 }, -- right brace bottom + ["0x7D.variants.*"] = { topright = -0.05, bottomright = -0.05 }, -- right brace variants + ["0x29.parts.top"] = { topright = -0.1, }, -- right parenthesis top + ["0x29.parts.bottom"] = { bottomright = -0.1 }, -- right parenthesis bottom + ["0x29.variants.*"] = { topright = -0.1, bottomright = -0.1 }, -- right parenthesis variants + ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top + ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom + ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants + [0x27E9] = { topright = -0.1, bottomright = -0.1 }, -- angle + ["0x27E9.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + [0x27EB] = { topright = -0.1, bottomright = -0.1 }, + ["0x27EB.variants.*"] = { topright = -0.2, bottomright = -0.2 }, + -- + [0x00393] = { bottomright = -0.20, }, -- upright Gamma + }, + }, + { + tweak = "radicaldegreeanchors", + list = { + ["0x221A.parts.bottom"] = { location = "left", hfactor = .1, vfactor = 1.025 }, + } + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "addactuarian", + }, + { + tweak = "addequals", + }, + { + tweak = "addprimed", + }, + { + tweak = "addfourier", + variant = 2, + }, + { + tweak = "setoptions", + -- set = { "ignorekerndimensions" } + }, + }, + }, + bigslots = { + 1, 2, 3, 4 + }, + }, + +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg index 88d3a8d45fa..1d7e22df61d 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg @@ -1,28 +1,15 @@ --- \setupbodyfont[xits] +-- When testing XITS in LMTX one has to do this: -- --- $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$ --- --- \setupmathematics[italics=1] test $a;b;a; b; f;$ test\par % fontitalics --- \setupmathematics[italics=2] test $a;b;a; b; f;$ test\par % fontdata --- \setupmathematics[italics=3] test $a;b;a; b; f;$ test\par % quad based --- \setupmathematics[italics=4] test $a;b;a; b; f;$ test\par % combination of 1 and 3 +-- \definefilesynonym [type-imp-xits.mkiv] [type-imp-xits.mkiv] -local italics = { - defaultfactor = 0.025, - disableengine = true, - corrections = { - -- [0x1D44E] = 0.99, -- a (fraction of quad) - -- [0x1D44F] = 100, -- b (font points) - [0x1D453] = -0.0375, -- f - -- todo: ssty 1/2 - } -} +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets return { name = "xits-math", version = "1.00", comment = "Goodies that complement xits (by Khaled Hosny).", - author = "Hans Hagen", + author = "Hans Hagen & Mikael Sundqvist", copyright = "ConTeXt development team", filenames = { ["xitsmath-regular.otf"] = { @@ -35,14 +22,102 @@ return { }, }, mathematics = { - -- italics = { - -- ["xits-math"] = italics, - -- }, - -- kernpairs = { - -- [0x1D44A] = { -- 𝑊 - -- [0x1D434] = -200, -- 𝐴 - -- }, - -- }, + parameters = { + NoLimitSupFactor = 0, + NoLimitSubFactor = 1000, + -- AccentBaseHeight = 0, + AccentBaseDepth = 30, + FlattenedAccentTopShiftUp = 0, -- now also set, the wide ones (so we can move in one go) + -- AccentExtendMargin = 50, + RadicalDegreeBottomRaisePercent = 65, + -- RadicalKernBeforeDegree = 500, + RadicalKernAfterDegree = -500, + RadicalVerticalGap = 10, + -- RadicalRuleThickness = 68, -- 68 in font (but shifted down) + DelimiterPercent = 90, + DelimiterShortfall = 400, + DisplayOperatorMinHeight = 1800, -- 1800 in font + PrimeRaisePercent = 75, -- 50 default + PrimeRaiseComposedPercent = 10, -- 25 default + + }, + tweaks = { + aftercopying = { + { + tweak = "version", + expected = "Version 1.302", + }, + { + tweak = "replacealphabets", + list = { + { + source = "uppercasescript", + target = "uppercasecalligraphic", + }, + { + source = "uppercasescript", + target = "uppercasescript", + feature = "ss01", + }, + }, + }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.95 }, + presets.rsfsuprighttoscript { rscale = 0.95 }, + presets.moderntocalligraphic { rscale = 0.95 }, + presets.eulertocalligraphic { rscale = 0.95 }, + presets.xitsarabic { rscale = 0.88 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.4 }, + presets.wipeitalics { }, + { + tweak = "kerns", + list = { + [0x2F] = { + topleft = -0.1, + -- bottomleft = 0, + -- topright = 0, + bottomright = -0.1, + }, + }, + }, + { + tweak = "dimensions", + list = { + -- nothing yet + }, + }, + { + tweak = "fixprimes", + -- smaller = true, + factor = 0.85, + }, + { + tweak = "checkspacing", + }, + { + tweak = "addscripts", + }, + { + tweak = "accentdimensions", + }, + { + tweak = "addrules", + }, + { + tweak = "setoptions", + set = { "ignorekerndimensions" } + }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, + }, + }, alternates = { calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" }, greekssup = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkxl/bhai.lfg b/Master/texmf-dist/tex/context/fonts/mkxl/bhai.lfg new file mode 100644 index 00000000000..7356f625546 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkxl/bhai.lfg @@ -0,0 +1,72 @@ +return { + name = "bhai", + version = "1.00", + comment = "Goodies that complement bhai.", + author = "Hans Hagen & Sreeram", + copyright = "ConTeXt development team", + sanitizers = { + gjr2rkrf = { + mapping = { + ["કે્ર"] = "ક્રે", + ["કૈ્ર"] = "ક્રૈ", + ["ખે્ર"] = "ખ્રે", + ["ખૈ્ર"] = "ખ્રૈ", + ["ગે્ર"] = "ગ્રે", + ["ગૈ્ર"] = "ગ્રૈ", + ["ઘે્ર"] = "ઘ્રે", + ["ઘૈ્ર"] = "ઘ્રૈ", + -- not required: placeholder + -- ["ઙે્ર"] = "ઙ્રે", + -- ["ઙૈ્ર"] = "ઙ્રૈ", + ["ચે્ર"] = "ચ્રે", + ["ચૈ્ર"] = "ચ્રૈ", + ["જે્ર"] = "જ્રે", + ["જૈ્ર"] = "જ્રૈ", + ["ઝે્ર"] = "ઝ્રે", + ["ઝૈ્ર"] = "ઝ્રૈ", + ["ઞે્ર"] = "ઞ્રે", + ["ઞૈ્ર"] = "ઞ્રૈ", + ["ણે્ર"] = "ણ્રે", + ["ણૈ્ર"] = "ણ્રૈ", + ["તે્ર"] = "ત્રે", + ["તૈ્ર"] = "ત્રૈ", + ["થે્ર"] = "થ્રે", + ["થૈ્ર"] = "થ્રૈ", + ["દે્ર"] = "દ્રે", + ["દૈ્ર"] = "દ્રૈ", + ["ધે્ર"] = "ધ્રે", + ["ધૈ્ર"] = "ધ્રૈ", + ["ને્ર"] = "ન્રે", + ["નૈ્ર"] = "ન્રૈ", + ["પે્ર"] = "પ્રે", + ["પૈ્ર"] = "પ્રૈ", + ["ફે્ર"] = "ફ્રે", + ["ફૈ્ર"] = "ફ્રૈ", + ["બે્ર"] = "બ્રે", + ["બૈ્ર"] = "બ્રૈ", + ["ભે્ર"] = "ભ્રે", + ["ભૈ્ર"] = "ભ્રૈ", + ["મે્ર"] = "મ્રે", + ["મૈ્ર"] = "મ્રૈ", + ["યે્ર"] = "ય્રે", + ["યૈ્ર"] = "ય્રૈ", + -- some fonts might need this, some might not + -- ["લે્ર"] = "લ્રે", + -- ["લૈ્ર"] = "લ્રૈ", + ["વે્ર"] = "વ્રે", + ["વૈ્ર"] = "વ્રૈ", + ["સે્ર"] = "સ્રે", + ["સૈ્ર"] = "સ્રૈ", + ["શે્ર"] = "શ્રે", + ["શૈ્ર"] = "શ્રૈ", + ["ષે્ર"] = "ષ્રે", + ["ષૈ્ર"] = "ષ્રૈ", + ["હે્ર"] = "હ્રે", + ["હૈ્ર"] = "હ્રૈ", + -- some fonts might need this, some might not + -- ["ળે્ર"] = "ળ્રે", + -- ["ળૈ્ર"] = "ળ્રૈ", + } + } + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkxl/shobhika.lfg b/Master/texmf-dist/tex/context/fonts/mkxl/shobhika.lfg new file mode 100644 index 00000000000..ae5473d7223 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkxl/shobhika.lfg @@ -0,0 +1,72 @@ +return { + name = "shobhika", + version = "1.00", + comment = "Goodies that complement shobhika.", + author = "Hans Hagen & Sreeram", + copyright = "ConTeXt development team", + sanitizers = { + dev2rkrf = { + mapping = { + ["के्र"] = "क्रे", + ["कै्र"] = "क्रै", + ["खे्र"] = "ख्रे", + ["खै्र"] = "ख्रै", + ["गे्र"] = "ग्रे", + ["गै्र"] = "ग्रै", + ["घे्र"] = "घ्रे", + ["घै्र"] = "घ्रै", + -- not required: placeholder + -- ["ङे्र"] = "ङ्रे", + -- ["ङै्र"] = "ङ्रै", + ["चे्र"] = "च्रे", + ["चै्र"] = "च्रै", + ["जे्र"] = "ज्रे", + ["जै्र"] = "ज्रै", + ["झे्र"] = "झ्रे", + ["झै्र"] = "झ्रै", + ["ञे्र"] = "ञ्रे", + ["ञै्र"] = "ञ्रै", + ["णे्र"] = "ण्रे", + ["णै्र"] = "ण्रै", + ["ते्र"] = "त्रे", + ["तै्र"] = "त्रै", + ["थे्र"] = "थ्रे", + ["थै्र"] = "थ्रै", + ["दे्र"] = "द्रे", + ["दै्र"] = "द्रै", + ["धे्र"] = "ध्रे", + ["धै्र"] = "ध्रै", + ["ने्र"] = "न्रे", + ["नै्र"] = "न्रै", + ["पे्र"] = "प्रे", + ["पै्र"] = "प्रै", + ["फे्र"] = "फ्रे", + ["फै्र"] = "फ्रै", + ["बे्र"] = "ब्रे", + ["बै्र"] = "ब्रै", + ["भे्र"] = "भ्रे", + ["भै्र"] = "भ्रै", + ["मे्र"] = "म्रे", + ["मै्र"] = "म्रै", + ["ये्र"] = "य्रे", + ["यै्र"] = "य्रै", + -- some fonts might need this, some might not + -- ["ले्र"] = "ल्रे", + -- ["लै्र"] = "ल्रै", + ["वे्र"] = "व्रे", + ["वै्र"] = "व्रै", + ["से्र"] = "स्रे", + ["सै्र"] = "स्रै", + ["शे्र"] = "श्रे", + ["शै्र"] = "श्रै", + ["षे्र"] = "ष्रे", + ["षै्र"] = "ष्रै", + ["हे्र"] = "ह्रे", + ["है्र"] = "ह्रै", + -- some fonts might need this, some might not + -- ["ळे्र"] = "ळ्रे", + -- ["ळै्र"] = "ळ्रै", + } + } + } +} |