summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii50
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv50
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii49
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv49
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkii53
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkiv53
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkii67
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkiv67
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii339
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv339
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex184
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkii46
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkiv46
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkii70
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkiv70
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-justus.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-miso.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-museo.mkii59
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-museo.mkiv59
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-optical.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-samba.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkii44
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkiv44
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex17
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii56
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv43
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii31
-rw-r--r--Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv31
89 files changed, 2609 insertions, 916 deletions
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
index 4cb26da2b82..1a9913e210a 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-adobe,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Adobe Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-adobe,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Adobe Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\definetypescriptprefix [f:minion] [minionpro]
\definetypescriptprefix [f:myriad] [myriadpro]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
index 29dedc7fe3c..abbb09d3251 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-adobe,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Adobe Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-adobe,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Adobe Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\definetypescriptprefix [f:minion] [minionpro]
\definetypescriptprefix [f:myriad] [myriadpro]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
index 3c804f7b2ac..1389302ef99 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-aller,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Aller Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-aller,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Aller Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [aller]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
index f08ab0d5178..9d9d9c684ec 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-aller,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Aller Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-aller,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Aller Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [aller]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
new file mode 100644
index 00000000000..770f6bc2f4c
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
@@ -0,0 +1,50 @@
+%D \module
+%D [ file=type-anivers,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Anivers Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [anivers]
+
+\starttypescript [\s!sans] [anivers]
+ \definefontsynonym [Anivers-Regular] [\s!file:Anivers_Regular] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Italic] [\s!file:Anivers_Italic] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Bold] [\s!file:Anivers_Bold] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Caps] [\s!file:Anivers_SmallCaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [anivers]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Anivers-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Anivers-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Anivers-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Anivers-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [anivers]
+ \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
new file mode 100644
index 00000000000..bdbdf836fdc
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
@@ -0,0 +1,50 @@
+%D \module
+%D [ file=type-anivers,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Anivers Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [anivers]
+
+\starttypescript [\s!sans] [anivers]
+ \definefontsynonym [Anivers-Regular] [\s!file:aniversregular] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Italic] [\s!file:aniversitalic] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Bold] [\s!file:aniversbold] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Caps] [\s!file:aniverssmallcaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [anivers]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Anivers-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Anivers-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Anivers-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Anivers-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [anivers]
+ \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
index 05fd863f360..d032068a367 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-apostrophiclab,
-%D version=2009.04.06,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Apostrophic Laboratories Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-apostrophiclab,
+%D version=2009.04.06,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Apostrophic Laboratories Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
index 5591c502a4a..bdcd2e6b1c9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-apostrophiclab,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Apostrophic Laboratories Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-apostrophiclab,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Apostrophic Laboratories Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
index 136d570a8e3..38ff74986c0 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-apostrophiclab,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Apostrophic Laboratories Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-apostrophiclab,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Apostrophic Laboratories Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
index 6857e2b9f41..722c80306c4 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-arkandis,
-%D version=2010.08.03,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Arkandis Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-arkandis,
+%D version=2010.08.03,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Arkandis Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [arkandis]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
index 6857e2b9f41..722c80306c4 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-arkandis,
-%D version=2010.08.03,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Arkandis Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-arkandis,
+%D version=2010.08.03,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Arkandis Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [arkandis]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
index b7a2020ad46..2e8b710c605 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-baar,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Baar Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-baar,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Baar Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D These are typescript for fonts designed by Lutz Baar. The fonts are donation
%D ware and can be downloaded from
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
index b7a2020ad46..2e8b710c605 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-baar,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Baar Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-baar,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Baar Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D These are typescript for fonts designed by Lutz Baar. The fonts are donation
%D ware and can be downloaded from
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
index 62dd9835f6f..896612212f6 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-bera,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Bera Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-bera,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Bera Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [bera]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
index de03d1dfe48..0e3eed3bb51 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-bera,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Bera Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-bera,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Bera Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [bera]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
index 8934f1a5edb..bdc257a8f8c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-calluna,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Calluna Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-calluna,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Calluna Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
%C
-%C Copyright 2010 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [calluna]
@@ -25,12 +38,26 @@
\definefontsynonym [\s!SerifItalic] [Calluna-Italic] [\s!features=\s!default]
\definefontsynonym [\s!SerifBold] [Calluna-Bold] [\s!features=\s!default]
\definefontsynonym [\s!SerifBoldItalic] [Calluna-BoldItalic] [\s!features=\s!default]
- \definefontsynonym [\s!SerifCaps] [Calluna-Caps] [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \definefontsynonym [CallunaSans-Regular] [\s!file:CallunaSansRegular] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Italic] [\s!file:CallunaSansItalic] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Bold] [\s!file:CallunaSansBold] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-BoldItalic] [\s!file:CallunaSansBoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [CallunaSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [CallunaSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [CallunaSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [CallunaSans-BoldItalic] [\s!features=\s!default]
\stoptypescript
\starttypescript [calluna]
\definetypeface [calluna] [rm] [\s!serif] [calluna] [\s!default]
- \definetypeface [calluna] [ss] [\s!sans] [modern] [\s!default]
+ \definetypeface [calluna] [ss] [\s!sans] [calluna] [\s!default]
\definetypeface [calluna] [tt] [\s!mono] [modern] [\s!default]
\definetypeface [calluna] [mm] [\s!math] [palatino] [\s!default]
\quittypescriptscanning
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
index ee193bb0dd5..0c0b0d02537 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-calluna,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Calluna Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-calluna,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Calluna Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
%C
-%C Copyright 2010 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [calluna]
@@ -25,12 +38,26 @@
\definefontsynonym [\s!SerifItalic] [Calluna-Italic] [\s!features=\s!default]
\definefontsynonym [\s!SerifBold] [Calluna-Bold] [\s!features=\s!default]
\definefontsynonym [\s!SerifBoldItalic] [Calluna-BoldItalic] [\s!features=\s!default]
- \definefontsynonym [\s!SerifCaps] [Calluna-Caps] [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \definefontsynonym [CallunaSans-Regular] [\s!file:callunasansregular] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Italic] [\s!file:callunasansitalic] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Bold] [\s!file:callunasansbold] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-BoldItalic] [\s!file:callunasansbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [CallunaSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [CallunaSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [CallunaSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [CallunaSans-BoldItalic] [\s!features=\s!default]
\stoptypescript
\starttypescript [calluna]
\definetypeface [calluna] [rm] [\s!serif] [calluna] [\s!default]
- \definetypeface [calluna] [ss] [\s!sans] [modern] [\s!default] [\s!rscale=\v!auto]
+ \definetypeface [calluna] [ss] [\s!sans] [calluna] [\s!default] [\s!rscale=\v!auto]
\definetypeface [calluna] [tt] [\s!mono] [modern] [\s!default] [\s!rscale=\v!auto]
\definetypeface [calluna] [mm] [\s!math] [palatino] [\s!default] [\s!rscale=\v!auto]
\quittypescriptscanning
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
index 9f4bd26c3c3..f96f5985b8f 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-charissil,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Charis SIL Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-charissil,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Charis SIL Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [charissil]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
index ca6e24845f1..6c76130e67d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-charissil,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Charis SIL Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-charissil,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Charis SIL Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [charissil]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
index ee2d0412cbd..74ddef029ad 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-charter,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Charter Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-charter,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Charter Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection[charter]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
index ad758ba41bb..75719b7e416 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-charter,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Charter Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-charter,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Charter Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection[charter]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
index b48f4611fdd..7c397fc1142 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-cmu,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Computer Modern Unicode Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-cmu,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Computer Modern Unicode Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [computer-modern-unicode]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
index b48f4611fdd..7c397fc1142 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-cmu,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Computer Modern Unicode Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-cmu,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Computer Modern Unicode Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [computer-modern-unicode]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
index cf494572f5a..0e530935e28 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-dejavu,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=DejaVu Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-dejavu,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=DejaVu Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D The DejaVu fonts are a font family based on the Vera Fonts but provide a
%D wider character range. They are available under a free font license and can
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
index a4cdfadf940..28e8b668755 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-dejavu,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=DejaVu Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-dejavu,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=DejaVu Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D The DejaVu fonts are a font family based on the Vera Fonts but provide a
%D wider character range. They are available under a free font license and can
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkii
new file mode 100644
index 00000000000..8b0e8c5a8f8
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkii
@@ -0,0 +1,53 @@
+%D \module
+%D [ file=type-delicious,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Delicious Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [delicious]
+
+\starttypescript [\s!sans] [delicious]
+ \definefontsynonym [Delicious-Regular] [\s!file:Delicious-Roman] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Italic] [\s!file:Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Bold] [\s!file:Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [Delicious-BoldItalic] [\s!file:Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Caps] [\s!file:Delicious-SmallCaps] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Heavy] [\s!file:Delicious-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [delicious]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Delicious-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Delicious-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [delicious]
+ \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkiv
new file mode 100644
index 00000000000..dbc45e2fef4
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-delicious.mkiv
@@ -0,0 +1,53 @@
+%D \module
+%D [ file=type-delicious,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Delicious Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [delicious]
+
+\starttypescript [\s!sans] [delicious]
+ \definefontsynonym [Delicious-Regular] [\s!file:deliciousroman] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Italic] [\s!file:deliciousitalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Bold] [\s!file:deliciousbold] [\s!features=\s!default]
+ \definefontsynonym [Delicious-BoldItalic] [\s!file:deliciousbolditalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Caps] [\s!file:delicioussmallcaps] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Heavy] [\s!file:deliciousheavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [delicious]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Delicious-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Delicious-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [delicious]
+ \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkii
new file mode 100644
index 00000000000..a13239d0115
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkii
@@ -0,0 +1,67 @@
+%D \module
+%D [ file=type-diavlo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Diavlo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [diavlo]
+
+\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definefontsynonym [DiavloLight-Regular] [\s!file:Diavlo_LIGHT_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBook-Regular] [\s!file:Diavlo_BOOK_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloMedium-Regular] [\s!file:Diavlo_MEDIUM_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBold-Regular] [\s!file:Diavlo_BOLD_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBlack-Regular] [\s!file:Diavlo_BLACK_II_37] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBook-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-light]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloLight-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBook-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-medium]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloMedium-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-bold]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBold-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkiv
new file mode 100644
index 00000000000..35681b204e3
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-diavlo.mkiv
@@ -0,0 +1,67 @@
+%D \module
+%D [ file=type-diavlo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Diavlo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [diavlo]
+
+\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definefontsynonym [DiavloLight-Regular] [\s!file:diavlolightii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBook-Regular] [\s!file:diavlobookii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloMedium-Regular] [\s!file:diavlomediumii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBold-Regular] [\s!file:diavloboldii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBlack-Regular] [\s!file:diavloblackii37] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBook-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-light]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloLight-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBook-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-medium]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloMedium-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-bold]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBold-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
index b1609ea99d0..ad34cd02922 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-droid,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Droid Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-droid,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Droid Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D Droid is a font family created by Ascender Corporation for the
%D Android platform, and licensed under the Apache license. They can be
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
index 9e7c212b7dc..34ec58d4b1c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-droid,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Droid Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-droid,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Droid Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
%D Droid is a font family created by Ascender Corporation for the
%D Android platform, and licensed under the Apache license. They can be
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
index f3c13d9ee6f..a3abc6787f7 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
@@ -1,82 +1,315 @@
%D \module
-%D [ file=type-exljbris,
-%D version=2009.04.04,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Exljbris Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-exljbris,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Exljbris Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+%D exljbris is a collection of fonts by Jos Buivenga. The fonts are
+%D \startitemize
+%D \head Anivers \par
+%D Anivers is a sans serif font that comes in regular, small caps,
+%D italic, and bold. Anivers Regular is free.
+%D \head Delicious \par
+%D Delicious is a sans serif font that comes in regular, small caps,
+%D italic, and bold. All variants are free.
+%D \head Diavlo \par
+%D Diavlo is a sans serif font that comes in light, book, medium,
+%D bold, and black. All variants are free.
+%D \head Fertigo Pro \par
+%D Fertigo Pro is a sans serif font that comes in regular weight. It
+%D is available freely.
+%D \head Fontin and Fontin Sans \par
+%D Fontin is a serif font and Fontin Sans is a matching sans serif
+%D font. Both come in regular, small caps, italic, and bold. Both
+%D fonts can be downloaded freely.
+%D \head Museo and Museo Sans \par
+%D Museo is a serif font and Museo Sans is a serif font. Both fonts comes
+%D in five weights (100 300 500 700 900). Museo Sans also has each
+%D weight in italic.
+%D
+%D For Museo, three weights are free (300 500 700) and two are paid
+%D (100 900). For Museo Sans, regular and italic at weight 500 are
+%D free; other eight are paid.
+%D \head Tallys \par
+%D Tallys is a serif font that comes in regular. It can be downloaded
+%D freely.
+%D \stopitemize
+%D
+%D More details, including links for download, are available at
+%D \hypenatedurl{http://www.josbuivenga.demon.nl}
+
+\starttypescriptcollection [exljbris]
+
+%D Anivers
+
+\starttypescript [\s!sans] [anivers]
+ \definefontsynonym [Anivers-Regular] [\s!file:Anivers_Regular] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Italic] [\s!file:Anivers_Italic] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Bold] [\s!file:Anivers_Bold] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Caps] [\s!file:Anivers_SmallCaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [anivers]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Anivers-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Anivers-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Anivers-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Anivers-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [anivers]
+ \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Calluna
+
+\starttypescript [\s!serif] [calluna]
+ \definefontsynonym [Calluna-Regular] [\s!file:Calluna-Regular] [\s!features=\s!default]
+ \definefontsynonym [Calluna-Italic] [\s!file:Calluna-It] [\s!features=\s!default]
+ \definefontsynonym [Calluna-Bold] [\s!file:Calluna-Bold] [\s!features=\s!default]
+ \definefontsynonym [Calluna-BoldItalic] [\s!file:Calluna-BoldIt] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [calluna]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Calluna-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Calluna-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Calluna-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBoldItalic] [Calluna-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \definefontsynonym [CallunaSans-Regular] [\s!file:CallunaSansRegular] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Italic] [\s!file:CallunaSansItalic] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Bold] [\s!file:CallunaSansBold] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-BoldItalic] [\s!file:CallunaSansBoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [CallunaSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [CallunaSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [CallunaSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [CallunaSans-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [calluna]
+ \definetypeface [calluna] [rm] [\s!serif] [calluna] [\s!default]
+ \definetypeface [calluna] [ss] [\s!sans] [calluna] [\s!default]
+ \definetypeface [calluna] [tt] [\s!mono] [modern] [\s!default]
+ \definetypeface [calluna] [mm] [\s!math] [palatino] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Delicious
+
+\starttypescript [\s!sans] [delicious]
+ \definefontsynonym [Delicious-Regular] [\s!file:Delicious-Roman] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Italic] [\s!file:Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Bold] [\s!file:Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [Delicious-BoldItalic] [\s!file:Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Caps] [\s!file:Delicious-SmallCaps] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Heavy] [\s!file:Delicious-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [delicious]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Delicious-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Delicious-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [delicious]
+ \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Diavlo
-% Anivers
+\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definefontsynonym [DiavloLight-Regular] [\s!file:Diavlo_LIGHT_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBook-Regular] [\s!file:Diavlo_BOOK_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloMedium-Regular] [\s!file:Diavlo_MEDIUM_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBold-Regular] [\s!file:Diavlo_BOLD_II_37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBlack-Regular] [\s!file:Diavlo_BLACK_II_37] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBook-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-light]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloLight-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBook-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-medium]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloMedium-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-bold]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBold-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [anivers]
- \definefontsynonym [Anivers-Regular] [name:Anivers Regular] [features=default]
+\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Delicious
+%D Fertigo Pro
-\starttypescript [sans] [delicious]
- \definefontsynonym [Delicious-Regular] [name:Delicious-Roman] [features=default]
- \definefontsynonym [Delicious-Italic] [name:Delicious-Italic] [features=default]
- \definefontsynonym [Delicious-Bold] [name:Delicious-Bold] [features=default]
- \definefontsynonym [Delicious-BoldItalic] [name:Delicious-BoldItalic] [features=default]
- \definefontsynonym [Delicious-Caps] [name:Delicious-SmallCaps] [features=default]
- \definefontsynonym [Delicious-Heavy] [name:Delicious-Heavy] [features=default]
+\starttypescript [\s!sans] [fertigo]
+ \definefontsynonym [FertigoPro-Regular] [\s!file:Fertigo_PRO] [\s!features=\s!default]
+ \definefontsynonym [FertigoPro-Italic] [\s!file:FertigoPro_Italic] [\s!features=\s!default]
\stoptypescript
-% Diavlo
+\starttypescript [\s!sans] [fertigo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FertigoPro-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FertigoPro-Italic] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
- \definefontsynonym [DiavloLight-Regular] [name:Diavlo Light Regular] [features=default]
- \definefontsynonym [DiavloBook-Regular] [name:Diavlo Book Regular] [features=default]
- \definefontsynonym [DiavloMedium-Regular] [name:Diavlo Medium Regular] [features=default]
- \definefontsynonym [DiavloBold-Regular] [name:Diavlo Bold Regular] [features=default]
- \definefontsynonym [DiavloBlack-Regular] [name:Diavlo Black Regular] [features=default]
+\starttypescript [fertigo]
+ \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Fertigo Pro
+%D Fontin, Fontin Sans
+
+\starttypescript [\s!serif] [fontin]
+ \definefontsynonym [Fontin-Regular] [\s!file:Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Italic] [\s!file:Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Bold] [\s!file:Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Caps] [\s!file:Fontin-SmallCaps] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [fertigo]
- \definefontsynonym [FertigoPro-Regular] [name:Fertigo Pro Regular] [features=default]
+\starttypescript [\s!serif] [fontin]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifCaps] [Fontin-Caps] [\s!features=\s!default]
\stoptypescript
-% Fontin, Fontin Sans
+\starttypescript [\s!sans] [fontin]
+ \definefontsynonym [FontinSans-Regular] [\s!file:Fontin_Sans_R_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Italic] [\s!file:Fontin_Sans_I_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Bold] [\s!file:Fontin_Sans_B_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-BoldItalic] [\s!file:Fontin_Sans_BI_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Caps] [\s!file:Fontin_Sans_SC_45b] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [fontin]
- \definefontsynonym [Fontin-Regular] [name:Fontin Regular] [features=default]
- \definefontsynonym [Fontin-Italic] [name:Fontin Italic] [features=default]
- \definefontsynonym [Fontin-Bold] [name:Fontin Bold] [features=default]
- \definefontsynonym [Fontin-Caps] [name:Fontin SmallCaps] [features=default]
+\starttypescript [\s!sans] [fontin]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FontinSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FontinSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [FontinSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [FontinSans-Caps] [\s!features=\s!default]
\stoptypescript
-\starttypescript [sans] [fontin]
- \definefontsynonym [FontinSans-Regular] [name:Fontin Sans Regular] [features=default]
- \definefontsynonym [FontinSans-Italic] [name:Fontin Sans Italic] [features=default]
- \definefontsynonym [FontinSans-Bold] [name:Fontin Sans Bold] [features=default]
- \definefontsynonym [FontinSans-BoldItalic] [name:Fontin Sans Bold Italic] [features=default]
- \definefontsynonym [FontinSans-Caps] [name:Fontin Sans Small Caps] [features=default]
+\starttypescript [fontin]
+ \definetypeface [fontin] [rm] [\s!serif] [fontin] [\s!default]
+ \definetypeface [fontin] [ss] [\s!sans] [fontin] [\s!default]
+ \definetypeface [fontin] [tt] [\s!mono] [modern] [\s!default] [rscale=1.1]
+ \definetypeface [fontin] [mm] [\s!math] [palatino] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Museo, Museo Sans
+%D Museo, Museo Sans
+
+\starttypescript [\s!serif] [museo]
+ \definefontsynonym [Museo-300] [\s!file:Museo300-Regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-500] [\s!file:Museo500-Regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-700] [\s!file:Museo700-Regular] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [museo]
- \definefontsynonym [Museo-300] [name:Museo 300] [features=default]
- \definefontsynonym [Museo-500] [name:Museo 500] [features=default]
- \definefontsynonym [Museo-700] [name:Museo 700] [features=default]
+\starttypescript [\s!serif] [museo]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Museo-500] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
\stoptypescript
-\starttypescript [sans] [museo]
- \definefontsynonym [MuseoSans-500] [name:Museo Sans 500] [features=default]
- \definefontsynonym [MuseoSans-500-Italic] [name:Museo Sans 500 Italic] [features=default]
+\starttypescript [\s!sans] [museo]
+ \definefontsynonym [MuseoSans-Regular] [\s!file:MuseoSans_500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSans-Italic] [\s!file:MuseoSans_500_Italic] [\s!features=\s!default]
\stoptypescript
-% Tallys
+\starttypescript [\s!sans] [museo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [MuseoSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [MuseoSans-Italic] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [tallys]
- \definefontsynonym [Tallys-Regular] [name:Tallys] [features=default]
+\starttypescript [museo]
+ \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
+ \definetypeface [museo] [ss] [\s!sans] [museo] [\s!default]
+ \quittypescriptscanning
\stoptypescript
+%D Museo Slab
+
+\starttypescript [\s!serif] [museo-slab]
+ \definefontsynonym [MuseoSlab-Regular] [\s!file:Museo_Slab_500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSlab-Italic] [\s!file:Museo_Slab_500italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [museo-slab]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [MuseoSlab-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [MuseoSlab-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [museo-slab]
+ \definetypeface [museo-slab] [rm] [\s!serif] [museo-slab] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Tallys
+
+\starttypescript [\s!serif] [tallys]
+ \definefontsynonym [Tallys-Regular] [\s!file:Tallys_15] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [tallys]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tallys]
+ \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
index e8fcfd0c34d..33a2e68d2c1 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
@@ -1,82 +1,315 @@
%D \module
-%D [ file=type-exljbris,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Exljbris Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-exljbris,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Exljbris Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+%D exljbris is a collection of fonts by Jos Buivenga. The fonts are
+%D \startitemize
+%D \head Anivers \par
+%D Anivers is a sans serif font that comes in regular, small caps,
+%D italic, and bold. Anivers Regular is free.
+%D \head Delicious \par
+%D Delicious is a sans serif font that comes in regular, small caps,
+%D italic, and bold. All variants are free.
+%D \head Diavlo \par
+%D Diavlo is a sans serif font that comes in light, book, medium,
+%D bold, and black. All variants are free.
+%D \head Fertigo Pro \par
+%D Fertigo Pro is a sans serif font that comes in regular weight. It
+%D is available freely.
+%D \head Fontin and Fontin Sans \par
+%D Fontin is a serif font and Fontin Sans is a matching sans serif
+%D font. Both come in regular, small caps, italic, and bold. Both
+%D fonts can be downloaded freely.
+%D \head Museo and Museo Sans \par
+%D Museo is a serif font and Museo Sans is a serif font. Both fonts comes
+%D in five weights (100 300 500 700 900). Museo Sans also has each
+%D weight in italic.
+%D
+%D For Museo, three weights are free (300 500 700) and two are paid
+%D (100 900). For Museo Sans, regular and italic at weight 500 are
+%D free; other eight are paid.
+%D \head Tallys \par
+%D Tallys is a serif font that comes in regular. It can be downloaded
+%D freely.
+%D \stopitemize
+%D
+%D More details, including links for download, are available at
+%D \hypenatedurl{http://www.josbuivenga.demon.nl}
+
+\starttypescriptcollection [exljbris]
+
+%D Anivers
+
+\starttypescript [\s!sans] [anivers]
+ \definefontsynonym [Anivers-Regular] [\s!file:aniversregular] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Italic] [\s!file:aniversitalic] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Bold] [\s!file:aniversbold] [\s!features=\s!default]
+ \definefontsynonym [Anivers-Caps] [\s!file:aniverssmallcaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [anivers]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Anivers-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Anivers-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Anivers-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Anivers-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [anivers]
+ \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Calluna
+
+\starttypescript [\s!serif] [calluna]
+ \definefontsynonym [Calluna-Regular] [\s!file:callunaregular] [\s!features=\s!default]
+ \definefontsynonym [Calluna-Italic] [\s!file:callunait] [\s!features=\s!default]
+ \definefontsynonym [Calluna-Bold] [\s!file:callunabold] [\s!features=\s!default]
+ \definefontsynonym [Calluna-BoldItalic] [\s!file:callunaboldit] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [calluna]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Calluna-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Calluna-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Calluna-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBoldItalic] [Calluna-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \definefontsynonym [CallunaSans-Regular] [\s!file:callunasansregular] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Italic] [\s!file:callunasansitalic] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-Bold] [\s!file:callunasansbold] [\s!features=\s!default]
+ \definefontsynonym [CallunaSans-BoldItalic] [\s!file:callunasansbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [calluna]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [CallunaSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [CallunaSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [CallunaSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [CallunaSans-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [calluna]
+ \definetypeface [calluna] [rm] [\s!serif] [calluna] [\s!default]
+ \definetypeface [calluna] [ss] [\s!sans] [calluna] [\s!default] [\s!rscale=\v!auto]
+ \definetypeface [calluna] [tt] [\s!mono] [modern] [\s!default] [\s!rscale=\v!auto]
+ \definetypeface [calluna] [mm] [\s!math] [palatino] [\s!default] [\s!rscale=\v!auto]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Delicious
+
+\starttypescript [\s!sans] [delicious]
+ \definefontsynonym [Delicious-Regular] [\s!file:deliciousroman] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Italic] [\s!file:deliciousitalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Bold] [\s!file:deliciousbold] [\s!features=\s!default]
+ \definefontsynonym [Delicious-BoldItalic] [\s!file:deliciousbolditalic] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Caps] [\s!file:delicioussmallcaps] [\s!features=\s!default]
+ \definefontsynonym [Delicious-Heavy] [\s!file:deliciousheavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [delicious]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [Delicious-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [Delicious-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [Delicious-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [Delicious-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [delicious]
+ \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Diavlo
-% Anivers
+\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definefontsynonym [DiavloLight-Regular] [\s!file:diavlolightii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBook-Regular] [\s!file:diavlobookii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloMedium-Regular] [\s!file:diavlomediumii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBold-Regular] [\s!file:diavloboldii37] [\s!features=\s!default]
+ \definefontsynonym [DiavloBlack-Regular] [\s!file:diavloblackii37] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBook-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-light]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloLight-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBook-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-medium]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloMedium-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [diavlo-bold]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [DiavloBold-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [anivers]
- \definefontsynonym [Anivers-Regular] [name:aniversregular] [features=default]
+\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+ \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Delicious
+%D Fertigo Pro
-\starttypescript [sans] [delicious]
- \definefontsynonym [Delicious-Regular] [name:deliciousroman] [features=default]
- \definefontsynonym [Delicious-Italic] [name:deliciousitalic] [features=default]
- \definefontsynonym [Delicious-Bold] [name:deliciousbold] [features=default]
- \definefontsynonym [Delicious-BoldItalic] [name:deliciousbolditalic] [features=default]
- \definefontsynonym [Delicious-Caps] [name:delicioussmallcaps] [features=default]
- \definefontsynonym [Delicious-Heavy] [name:deliciousheavy] [features=default]
+\starttypescript [\s!sans] [fertigo]
+ \definefontsynonym [FertigoPro-Regular] [\s!file:fertigopro] [\s!features=\s!default]
+ \definefontsynonym [FertigoPro-Italic] [\s!file:Fertigoproitalic] [\s!features=\s!default]
\stoptypescript
-% Diavlo
+\starttypescript [\s!sans] [fertigo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FertigoPro-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FertigoPro-Italic] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
- \definefontsynonym [DiavloLight-Regular] [name:diavlolightregular] [features=default]
- \definefontsynonym [DiavloBook-Regular] [name:diavlobookregular] [features=default]
- \definefontsynonym [DiavloMedium-Regular] [name:diavlomediumregular] [features=default]
- \definefontsynonym [DiavloBold-Regular] [name:diavloboldregular] [features=default]
- \definefontsynonym [DiavloBlack-Regular] [name:diavloblackregular] [features=default]
+\starttypescript [fertigo]
+ \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Fertigo Pro
+%D Fontin, Fontin Sans
+
+\starttypescript [\s!serif] [fontin]
+ \definefontsynonym [Fontin-Regular] [\s!file:fontinregular] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Italic] [\s!file:fontinitalic] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Bold] [\s!file:fontinbold] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Caps] [\s!file:fontinsmallcaps] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [sans] [fertigo]
- \definefontsynonym [FertigoPro-Regular] [name:fertigoproregular] [features=default]
+\starttypescript [\s!serif] [fontin]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifCaps] [Fontin-Caps] [\s!features=\s!default]
\stoptypescript
-% Fontin, Fontin Sans
+\starttypescript [\s!sans] [fontin]
+ \definefontsynonym [FontinSans-Regular] [\s!file:fontinsansr45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Italic] [\s!file:fontinsansi45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Bold] [\s!file:fontinsansb45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-BoldItalic] [\s!file:fontinsansbi45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Caps] [\s!file:fontinsanssc45b] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [fontin]
- \definefontsynonym [Fontin-Regular] [name:fontinregular] [features=default]
- \definefontsynonym [Fontin-Italic] [name:fontinitalic] [features=default]
- \definefontsynonym [Fontin-Bold] [name:fontinbold] [features=default]
- \definefontsynonym [Fontin-Caps] [name:fontinsmallcaps] [features=default]
+\starttypescript [\s!sans] [fontin]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FontinSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FontinSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [FontinSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [FontinSans-Caps] [\s!features=\s!default]
\stoptypescript
-\starttypescript [sans] [fontin]
- \definefontsynonym [FontinSans-Regular] [name:fontinsansregular] [features=default]
- \definefontsynonym [FontinSans-Italic] [name:fontinsansitalic] [features=default]
- \definefontsynonym [FontinSans-Bold] [name:fontinsansbold] [features=default]
- \definefontsynonym [FontinSans-BoldItalic] [name:fontinsansbolditalic] [features=default]
- \definefontsynonym [FontinSans-Caps] [name:fontinsanssmallcaps] [features=default]
+\starttypescript [fontin]
+ \definetypeface [fontin] [rm] [\s!serif] [fontin] [\s!default]
+ \definetypeface [fontin] [ss] [\s!sans] [fontin] [\s!default]
+ \definetypeface [fontin] [tt] [\s!mono] [modern] [\s!default] [rscale=1.1]
+ \definetypeface [fontin] [mm] [\s!math] [palatino] [\s!default]
+ \quittypescriptscanning
\stoptypescript
-% Museo, Museo Sans
+%D Museo, Museo Sans
+
+\starttypescript [\s!serif] [museo]
+ \definefontsynonym [Museo-300] [\s!file:museo300regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-500] [\s!file:museo500regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-700] [\s!file:museo700regular] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [museo]
- \definefontsynonym [Museo-300] [name:museo300] [features=default]
- \definefontsynonym [Museo-500] [name:museo500] [features=default]
- \definefontsynonym [Museo-700] [name:museo700] [features=default]
+\starttypescript [\s!serif] [museo]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Museo-500] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
\stoptypescript
-\starttypescript [sans] [museo]
- \definefontsynonym [MuseoSans-500] [name:museosans500] [features=default]
- \definefontsynonym [MuseoSans-500-Italic] [name:museosans500italic] [features=default]
+\starttypescript [\s!sans] [museo]
+ \definefontsynonym [MuseoSans-Regular] [\s!file:museosans500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSans-Italic] [\s!file:museosans500italic] [\s!features=\s!default]
\stoptypescript
-% Tallys
+\starttypescript [\s!sans] [museo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [MuseoSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [MuseoSans-Italic] [\s!features=\s!default]
+\stoptypescript
-\starttypescript [serif] [tallys]
- \definefontsynonym [Tallys-Regular] [name:tallys] [features=default]
+\starttypescript [museo]
+ \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
+ \definetypeface [museo] [ss] [\s!sans] [museo] [\s!default]
+ \quittypescriptscanning
\stoptypescript
+%D Museo Slab
+
+\starttypescript [\s!serif] [museo-slab]
+ \definefontsynonym [MuseoSlab-Regular] [\s!file:museoslab500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSlab-Italic] [\s!file:museoslab500italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [museo-slab]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [MuseoSlab-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [MuseoSlab-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [museo-slab]
+ \definetypeface [museo-slab] [rm] [\s!serif] [museo-slab] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+%D Tallys
+
+\starttypescript [\s!serif] [tallys]
+ \definefontsynonym [Tallys-Regular] [\s!file:tallys15] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [tallys]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tallys]
+ \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
deleted file mode 100644
index 02cbe3c19ed..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
+++ /dev/null
@@ -1,184 +0,0 @@
-%D \module
-%D [ file=type-exljbris,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Exljbris Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-%D exljbris is a collection of fonts by Jos Buivenga. The fonts are
-%D \startitemize
-%D \head Anivers \par
-%D Anivers is a sans serif font that comes in regular, small caps,
-%D italic, and bold. Anivers Regular is free.
-%D \head Delicious \par
-%D Delicious is a sans serif font that comes in regular, small caps,
-%D italic, and bold. All variants are free.
-%D \head Diavlo \par
-%D Diavlo is a sans serif font that comes in light, book, medium,
-%D bold, and black. All variants are free.
-%D \head Fertigo Pro \par
-%D Fertigo Pro is a sans serif font that comes in regular weight. It
-%D is available freely.
-%D \head Fontin and Fontin Sans \par
-%D Fontin is a serif font and Fontin Sans is a matching sans serif
-%D font. Both come in regular, small caps, italic, and bold. Both
-%D fonts can be downloaded freely.
-%D \head Museo and Museo Sans \par
-%D Museo is a serif font and Museo Sans is a serif font. Both fonts comes
-%D in five weights (100 300 500 700 900). Museo Sans also has each
-%D weight in italic.
-%D
-%D For Museo, three weights are free (300 500 700) and two are paid
-%D (100 900). For Museo Sans, regular and italic at weight 500 are
-%D free; other eight are paid.
-%D \head Tallys \par
-%D Tallys is a serif font that comes in regular. It can be downloaded
-%D freely.
-%D \stopitemize
-%D
-%D More details, including links for download, are available at
-%D \hypenatedurl{http://www.josbuivenga.demon.nl}
-
-\starttypescriptcollection [exljbris]
-
-% Anivers
-
-\starttypescript [sans] [anivers]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [Anivers-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [anivers]
- \definetypeface [anivers] [ss] [sans] [anivers] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Delicious
-
-\starttypescript [sans] [delicious]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [Delicious-Regular]
- \definefontsynonym [SansItalic] [Delicious-Italic]
- \definefontsynonym [SansBold] [Delicious-Bold]
- \definefontsynonym [SansBoldItalic] [Delicious-BoldItalic]
- \definefontsynonym [SansCaps] [Delicious-Caps]
-\stoptypescript
-
-\starttypescript [delicious]
- \definetypeface [delicious] [ss] [sans] [delicious] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Diavlo
-
-\starttypescript [sans] [diavlo]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [DiavloBook-Regular] [features=default]
- \definefontsynonym [SansBold] [DiavloMedium-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [diavlo-light]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [DiavloLight-Regular] [features=default]
- \definefontsynonym [SansBold] [DiavloBook-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [diavlo-medium]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [DiavloMedium-Regular] [features=default]
- \definefontsynonym [SansBold] [DiavloBlack-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [diavlo-bold]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [DiavloBold-Regular] [features=default]
- \definefontsynonym [SansBold] [DiavloBlack-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
- \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Fertigo Pro
-
-\starttypescript [sans] [fertigo]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [FertigoPro-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [fertigo]
- \definetypeface [fertigo] [ss] [sans] [fertigo] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Fontin, Fontin Sans
-
-\starttypescript [serif] [fontin]
- \setups[font:fallback:serif]
- \definefontsynonym [Serif] [Fontin-Regular]
- \definefontsynonym [SerifItalic] [Fontin-Italic]
- \definefontsynonym [SerifBold] [Fontin-Bold]
- \definefontsynonym [SerifBoldItalic] [SerifBold]
- \definefontsynonym [SerifCaps] [Fontin-Caps]
-\stoptypescript
-
-\starttypescript [sans] [fontin]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [FontinSans-Regular]
- \definefontsynonym [SansItalic] [FontinSans-Italic]
- \definefontsynonym [SansBold] [FontinSans-Bold]
- \definefontsynonym [SansBoldItalic] [FontinSans-BoldItalic]
- \definefontsynonym [SansCaps] [FontinSans-Caps]
-\stoptypescript
-
-\starttypescript [fontin]
- \definetypeface [fontin] [rm] [serif] [fontin] [default]
- \definetypeface [fontin] [ss] [sans] [fontin] [default]
- \definetypeface [fontin] [tt] [mono] [modern] [default] [rscale=1.1]
- \definetypeface [fontin] [mm] [math] [palatino] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Museo, Museo Sans
-
-\starttypescript [serif] [museo]
- \setups[font:fallback:serif]
- \definefontsynonym [Serif] [Museo-500] [features=default]
- \definefontsynonym [SerifBold] [Museo-700] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [museo]
- \setups[font:fallback:sans]
- \definefontsynonym [Sans] [MuseoSans-500] [features=default]
- \definefontsynonym [SansItalic] [MuseoSans-500-Italic] [features=default]
-\stoptypescript
-
-\starttypescript [museo]
- \definetypeface [museo] [rm] [serif] [museo] [default]
- \definetypeface [museo] [ss] [sans] [museo] [default]
- \quittypescriptscanning
-\stoptypescript
-
-% Tallys
-
-\starttypescript [serif] [tallys]
- \setups[font:fallback:serif]
- \definefontsynonym [Serif] [Tallys-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [tallys]
- \definetypeface [tallys] [rm] [serif] [tallys] [default]
- \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-exljbris}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkii
new file mode 100644
index 00000000000..0afe073571e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkii
@@ -0,0 +1,46 @@
+%D \module
+%D [ file=type-fertigo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fertigo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [fertigo]
+
+\starttypescript [\s!sans] [fertigo]
+ \definefontsynonym [FertigoPro-Regular] [\s!file:Fertigo_PRO] [\s!features=\s!default]
+ \definefontsynonym [FertigoPro-Italic] [\s!file:FertigoPro_Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fertigo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FertigoPro-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FertigoPro-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [fertigo]
+ \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkiv
new file mode 100644
index 00000000000..a84e7e91ddb
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fertigo.mkiv
@@ -0,0 +1,46 @@
+%D \module
+%D [ file=type-fertigo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fertigo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [fertigo]
+
+\starttypescript [\s!sans] [fertigo]
+ \definefontsynonym [FertigoPro-Regular] [\s!file:fertigopro] [\s!features=\s!default]
+ \definefontsynonym [FertigoPro-Italic] [\s!file:Fertigoproitalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fertigo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FertigoPro-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FertigoPro-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [fertigo]
+ \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkii
new file mode 100644
index 00000000000..a6711158361
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkii
@@ -0,0 +1,70 @@
+%D \module
+%D [ file=type-fontin,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fontin Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [fontin]
+
+\starttypescript [\s!serif] [fontin]
+ \definefontsynonym [Fontin-Regular] [\s!file:Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Italic] [\s!file:Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Bold] [\s!file:Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Caps] [\s!file:Fontin-SmallCaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [fontin]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifCaps] [Fontin-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fontin]
+ \definefontsynonym [FontinSans-Regular] [\s!file:Fontin_Sans_R_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Italic] [\s!file:Fontin_Sans_I_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Bold] [\s!file:Fontin_Sans_B_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-BoldItalic] [\s!file:Fontin_Sans_BI_45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Caps] [\s!file:Fontin_Sans_SC_45b] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fontin]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FontinSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FontinSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [FontinSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [FontinSans-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [fontin]
+ \definetypeface [fontin] [rm] [\s!serif] [fontin] [\s!default]
+ \definetypeface [fontin] [ss] [\s!sans] [fontin] [\s!default]
+ \definetypeface [fontin] [tt] [\s!mono] [modern] [\s!default] [rscale=1.1]
+ \definetypeface [fontin] [mm] [\s!math] [palatino] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkiv
new file mode 100644
index 00000000000..027d2f37f96
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontin.mkiv
@@ -0,0 +1,70 @@
+%D \module
+%D [ file=type-fontin,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fontin Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [fontin]
+
+\starttypescript [\s!serif] [fontin]
+ \definefontsynonym [Fontin-Regular] [\s!file:fontinregular] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Italic] [\s!file:fontinitalic] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Bold] [\s!file:fontinbold] [\s!features=\s!default]
+ \definefontsynonym [Fontin-Caps] [\s!file:fontinsmallcaps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [fontin]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Fontin-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifItalic] [Fontin-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Fontin-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifCaps] [Fontin-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fontin]
+ \definefontsynonym [FontinSans-Regular] [\s!file:fontinsansr45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Italic] [\s!file:fontinsansi45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Bold] [\s!file:fontinsansb45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-BoldItalic] [\s!file:fontinsansbi45b] [\s!features=\s!default]
+ \definefontsynonym [FontinSans-Caps] [\s!file:fontinsanssc45b] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [fontin]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [FontinSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [FontinSans-Italic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBold] [FontinSans-Bold] [\s!features=\s!default]
+ \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
+ \definefontsynonym [\s!SansCaps] [FontinSans-Caps] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [fontin]
+ \definetypeface [fontin] [rm] [\s!serif] [fontin] [\s!default]
+ \definetypeface [fontin] [ss] [\s!sans] [fontin] [\s!default]
+ \definetypeface [fontin] [tt] [\s!mono] [modern] [\s!default] [rscale=1.1]
+ \definetypeface [fontin] [mm] [\s!math] [palatino] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
index 64abbe3fef2..7699f07e693 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-fontsite,
-%D version=2009.04.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Fontsite Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-fontsite,
+%D version=2009.04.15,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fontsite Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
index e1bf476c5ed..862872d8c56 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-fontsite,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Fontsite Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-fontsite,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fontsite Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
index ebe35cd4e0c..92c91c10bac 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-fontsite,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Fontsite Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-fontsite,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Fontsite Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
index fbe92a2dda0..e6fe8003abb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-gfs,
-%D version=2009.03.29,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=GFS Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-gfs,
+%D version=2009.03.29,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=GFS Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
index 97c9482d9d5..fa016ef770c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-gfs,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=GFS Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-gfs,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=GFS Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
index ffd6d79f176..7e820666864 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-gfs,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=GFS Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-gfs,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=GFS Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
index 516c0ef2882..ac2e5a27bfb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-junicode,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Junicode Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-junicode,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Junicode Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
index 2718cc955fb..b1c83a6ab57 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-justus,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Sabon Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-justus,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Justus Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
index b7f5facb7ae..05ed62c5ebd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-kaffeesatz,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Kaffeesatz Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-kaffeesatz,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Kaffeesatz Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [kaffeesatz]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
index 5be3e77b4c0..3ede739fed2 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-kaffeesatz,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Kaffeesatz Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-kaffeesatz,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Kaffeesatz Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [kaffeesatz]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
index 125fcb734a0..eadd025b6d4 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-kontrapunkt,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Kontrapunkt Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-kontrapunkt,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Kontrapunkt Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex b/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
index 8f4d5f94533..77f49642d48 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-leftist,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Leftist Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-leftist,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Leftist Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
index 1c88464f100..56713079a9c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-liberation,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Liberation Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-liberation,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Liberation Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [liberation]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
index 0acc29f22e6..a5a36ffa7dd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-liberation,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Liberation Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-liberation,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Liberation Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [liberation]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
index 33d6c3adfc5..7a324471e1d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-linuxlibertine,
-%D version=2009.03.24,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Linux Libertine Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-linuxlibertine,
+%D version=2009.03.24,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Linux Libertine Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
index 19c898a18a3..6bd0e58cbe8 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-linuxlibertine,
-%D version=2009.07.23,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Linux Libertine Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-linuxlibertine,
+%D version=2009.07.23,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Linux Libertine Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
index abac3fdd53f..527ef801e54 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-linuxlibertine,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Linux Libertine Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-linuxlibertine,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Linux Libertine Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
index a9f929e93a5..13117c9bb8c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-luxi,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Luxi Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-luxi,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Luxi Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection[luxi]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
index a9f929e93a5..13117c9bb8c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-luxi,
-%D version=2010.09.13,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Luxi Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-luxi,
+%D version=2010.09.13,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Luxi Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection[luxi]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
index 31d44745ac9..bcb7b4b3eab 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-mgopen,
-%D version=2008.07.27,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=MgOpen Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-mgopen,
+%D version=2008.07.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=MgOpen Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
index c46c1175e13..247daca6dc4 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-mgopen,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=MgOpen Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-mgopen,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=MgOpen Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
index a8fd0186109..200df28405c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-mgopen,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=MgOpen Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-mgopen,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=MgOpen Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
index 4f89f090eb0..3e4dcfd6ec0 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-miso,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Miso Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-miso,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Miso Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkii
new file mode 100644
index 00000000000..1cebbce0942
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkii
@@ -0,0 +1,59 @@
+%D \module
+%D [ file=type-museo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Museo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [museo]
+
+\starttypescript [\s!serif] [museo]
+ \definefontsynonym [Museo-300] [\s!file:Museo300-Regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-500] [\s!file:Museo500-Regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-700] [\s!file:Museo700-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [museo]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Museo-500] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [museo]
+ \definefontsynonym [MuseoSans-Regular] [\s!file:MuseoSans_500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSans-Italic] [\s!file:MuseoSans_500_Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [museo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [MuseoSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [MuseoSans-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [museo]
+ \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
+ \definetypeface [museo] [ss] [\s!sans] [museo] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkiv
new file mode 100644
index 00000000000..119477b814d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-museo.mkiv
@@ -0,0 +1,59 @@
+%D \module
+%D [ file=type-museo,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Museo Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [museo]
+
+\starttypescript [\s!serif] [museo]
+ \definefontsynonym [Museo-300] [\s!file:museo300regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-500] [\s!file:museo500regular] [\s!features=\s!default]
+ \definefontsynonym [Museo-700] [\s!file:museo700regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [museo]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Museo-500] [\s!features=\s!default]
+ \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [museo]
+ \definefontsynonym [MuseoSans-Regular] [\s!file:museosans500] [\s!features=\s!default]
+ \definefontsynonym [MuseoSans-Italic] [\s!file:museosans500italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [museo]
+ \setups[\s!font:\s!fallback:\s!sans]
+ \definefontsynonym [\s!Sans] [MuseoSans-Regular] [\s!features=\s!default]
+ \definefontsynonym [\s!SansItalic] [MuseoSans-Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [museo]
+ \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
+ \definetypeface [museo] [ss] [\s!sans] [museo] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex b/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
index 5c5f1a20622..ad086908507 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-nichtlustig,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Nichtlustig Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-nichtlustig,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Nichtlustig Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex b/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
index 25362ff8778..5ffbfdad8bf 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-optical,
-%D version=2009.03.25,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Adobe Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-optical,
+%D version=2009.03.25,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Adobe Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
index e851f52b086..927a5319e40 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-pigiarniq,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Pigiarniq Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-pigiarniq,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Pigiarniq Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [pigiarniq]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
index 6885b4d95b6..4caeb14ddab 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-pigiarniq,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Pigiarniq Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-pigiarniq,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Pigiarniq Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [pigiarniq]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
index c0978d6b2fc..16a54a89be3 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-richtype,
-%D version=2008.07.27,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Richtype Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-richtype,
+%D version=2008.07.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Richtype Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
index e14c629cefb..b2161e67dcd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-richtype,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Richtype Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-richtype,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Richtype Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
index 1744016fa53..12a55cb6fe3 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-richtype,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Richtype Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-richtype,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Richtype Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
index ccfb8fc71ab..b2713d52977 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-sabon,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Sabon Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-sabon,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Sabon Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [sabon]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
index d7f5038edbb..d56cf231523 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-sabon,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Sabon Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-sabon,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Sabon Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [sabon]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
index 237a4b9478f..82768f5321b 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-samba,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Samba Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-samba,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Samba Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
index 69d500c0fa2..2c79e6aec4f 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-smeltery,
-%D version=2009.04.06,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=SMeltery Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-smeltery,
+%D version=2009.04.06,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=SMeltery Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
index 051f343ea01..3174f8e7308 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-smeltery,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=SMeltery Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-smeltery,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=SMeltery Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
index 906eea2f8ec..aa7c092af24 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-smeltery,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=SMeltery Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-smeltery,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=SMeltery Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkii
new file mode 100644
index 00000000000..f53a8242eb5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkii
@@ -0,0 +1,44 @@
+%D \module
+%D [ file=type-tallys,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Tallys Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [tallys]
+
+\starttypescript [\s!serif] [tallys]
+ \definefontsynonym [Tallys-Regular] [\s!file:Tallys_15] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [tallys]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tallys]
+ \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkiv
new file mode 100644
index 00000000000..03d2c778011
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tallys.mkiv
@@ -0,0 +1,44 @@
+%D \module
+%D [ file=type-tallys,
+%D version=2010.10.27,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Tallys Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [tallys]
+
+\starttypescript [\s!serif] [tallys]
+ \definefontsynonym [Tallys-Regular] [\s!file:tallys15] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [tallys]
+ \setups[\s!font:\s!fallback:\s!serif]
+ \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tallys]
+ \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
+ \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
index 695bc348a96..e936a9ede04 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-tuffy,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Tuffy Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-tuffy,
+%D version=2010.09.15,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Tuffy Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [tuffy]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
index 9c4a100738d..d13fd4767d6 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-tuffy,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Tuffy Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-tuffy,
+%D version=2010.09.15,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Tuffy Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [tuffy]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
index 485942cc7f5..0d8dbf32932 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
@@ -1,12 +1,13 @@
%D \module
-%D [ file=type-uqammaq,
-%D version=2009.08.18,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Uqammaq Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
-%C
+%D [ file=type-uqammaq,
+%D version=2009.08.18,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Uqammaq Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
%C Copyright 2009 Wolfgang Schuster.
%C This file may be distributed under the GNU General Public License v. 2.0.
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
index 358a7088bec..8d0ee9f4ce9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-vera,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Bitstream Vera Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vera,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Bitstream Vera Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vera]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
index 89a7eac856b..b34cd37e773 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-vera,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Bitstream Vera Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vera,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Bitstream Vera Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vera]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
index 1a0cc63e740..fc56865f237 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-verajja,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Verajja Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-verajja,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Verajja Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [verajja]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
index fabe2033775..b4ceb2e9fe1 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-verajja,
-%D version=2010.09.14,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Verajja Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-verajja,
+%D version=2010.09.14,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Verajja Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [verajja]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
index 268809c4f1a..3c785b6fdab 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
@@ -1,17 +1,32 @@
%D \module
-%D [ file=type-vista,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Vista Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vista,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Vista Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2011 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vista]
+% Cambria
+
\starttypescript [\s!serif] [cambria]
\definefontsynonym [Cambria-Regular] [\s!file:CAMBRIA] [\s!features=\s!default]
\definefontsynonym [Cambria-Italic] [\s!file:CAMBRIAI] [\s!features=\s!default]
@@ -28,6 +43,13 @@
\definefontsynonym [\s!SerifCaps] [Cambria-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+\starttypescript [cambria]
+ \definetypeface [cambria] [rm] [\s!serif] [cambria] [\s!default]
+ \definetypeface [cambria] [mm] [\s!math ] [cambria] [\s!default]
+\stoptypescript
+
+% Constantia
+
\starttypescript [\s!serif] [constantia]
\definefontsynonym [Constantia-Regular] [\s!file:CONSTAN] [\s!features=\s!default]
\definefontsynonym [Constantia-Italic] [\s!file:CONSTANI] [\s!features=\s!default]
@@ -44,6 +66,12 @@
\definefontsynonym [\s!SerifCaps] [Constantia-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+\starttypescript [constantia]
+ \definetypeface [constantia] [rm] [\s!serif] [constantia] [\s!default]
+\stoptypescript
+
+% Calibri
+
\starttypescript [\s!sans] [calibri]
\definefontsynonym [Calibri-Regular] [\s!file:CALIBRI] [\s!features=\s!default]
\definefontsynonym [Calibri-Italic] [\s!file:CALIBRII] [\s!features=\s!default]
@@ -60,6 +88,8 @@
\definefontsynonym [\s!SansCaps] [Calibri-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Candara
+
\starttypescript [\s!sans] [candara]
\definefontsynonym [Candara-Regular] [\s!file:CANDARA] [\s!features=\s!default]
\definefontsynonym [Candara-Italic] [\s!file:CANDARAI] [\s!features=\s!default]
@@ -76,6 +106,8 @@
\definefontsynonym [\s!SansCaps] [Candara-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Corbel
+
\starttypescript [\s!sans] [corbel]
\definefontsynonym [Corbel-Regular] [\s!file:CORBEL] [\s!features=\s!default]
\definefontsynonym [Corbel-Italic] [\s!file:CORBELI] [\s!features=\s!default]
@@ -92,6 +124,8 @@
\definefontsynonym [\s!SansCaps] [Corbel-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Consolas
+
\starttypescript [\s!mono] [consolas]
\definefontsynonym [Consolas-Regular] [\s!file:CONSOLA] [\s!features=\s!default]
\definefontsynonym [Consolas-Italic] [\s!file:CONSOLAI] [\s!features=\s!default]
@@ -108,10 +142,6 @@
\definefontsynonym [\s!MonoCaps] [Consolas-Regular] [\s!features=\s!smallcaps]
\stoptypescript
-\starttypescript [cambria,constantia]
- \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
-\stoptypescript
-
\starttypescript [calibri,candara,corbel]
\definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
\stoptypescript
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
index 2f3d8bfe53d..23c51d3cddc 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
@@ -1,17 +1,32 @@
%D \module
-%D [ file=type-vista,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Vista Collection,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vista,
+%D version=2011.01.01,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Vista Collection,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2011 Wolfgang Schuster
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vista]
+% Cambria
+
\starttypescript [\s!serif] [cambria]
\definefontsynonym [Cambria-Regular] [\s!file:cambria] [\s!features=\s!default]
\definefontsynonym [Cambria-Italic] [\s!file:cambriai] [\s!features=\s!default]
@@ -28,6 +43,8 @@
\definefontsynonym [\s!SerifCaps] [Cambria-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Constantia
+
\starttypescript [\s!serif] [constantia]
\definefontsynonym [Constantia-Regular] [\s!file:constan] [\s!features=\s!default]
\definefontsynonym [Constantia-Italic] [\s!file:constani] [\s!features=\s!default]
@@ -44,6 +61,8 @@
\definefontsynonym [\s!SerifCaps] [Constantia-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Calibri
+
\starttypescript [\s!sans] [calibri]
\definefontsynonym [Calibri-Regular] [\s!file:calibri] [\s!features=\s!default]
\definefontsynonym [Calibri-Italic] [\s!file:calibrii] [\s!features=\s!default]
@@ -60,6 +79,8 @@
\definefontsynonym [\s!SansCaps] [Calibri-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Candara
+
\starttypescript [\s!sans] [candara]
\definefontsynonym [Candara-Regular] [\s!file:candara] [\s!features=\s!default]
\definefontsynonym [Candara-Italic] [\s!file:candarai] [\s!features=\s!default]
@@ -76,6 +97,8 @@
\definefontsynonym [\s!SansCaps] [Candara-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Corbel
+
\starttypescript [\s!sans] [corbel]
\definefontsynonym [Corbel-Regular] [\s!file:corbel] [\s!features=\s!default]
\definefontsynonym [Corbel-Italic] [\s!file:corbeli] [\s!features=\s!default]
@@ -92,6 +115,8 @@
\definefontsynonym [\s!SansCaps] [Corbel-Regular] [\s!features=\s!smallcaps]
\stoptypescript
+% Consolas
+
\starttypescript [\s!mono] [consolas]
\definefontsynonym [Consolas-Regular] [\s!file:consola] [\s!features=\s!default]
\definefontsynonym [Consolas-Italic] [\s!file:consolai] [\s!features=\s!default]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
index 01e8a491c07..6f6cfe1565d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-vollkorn,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Vollkorn Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vollkorn,
+%D version=2010.09.15,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Vollkorn Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vollkorn]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
index c12b5c6bc7d..610e386bbe6 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
@@ -1,14 +1,27 @@
%D \module
-%D [ file=type-vollkorn,
-%D version=2010.09.15,
-%D title=\CONTEXT\ Typescript Macros,
-%D subtitle=Vollkorn Font Definitions,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster]
+%D [ file=type-vollkorn,
+%D version=2010.09.15,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Vollkorn Font Definitions,
+%D author=Wolfgang Schuster,
+%D date=\currentdate,
+%D copyright=Wolfgang Schuster,
+%D license=GNU General Public License]
+
+%C Copyright (C) 2010 Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%C GNU General Public License for more details.
%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
+%C You should have received a copy of the GNU General Public License
+%C along with this program. If not, see <http://www.gnu.org/licenses/>.
\starttypescriptcollection [vollkorn]