From 8031c6c35191cc31959ad6ce1282ea903dd4083e Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Mon, 31 Jan 2011 00:30:47 +0200
Subject: beta 2011.01.25 10:40
---
tex/context/base/buff-imp-default.lua | 4 ++--
tex/context/base/buff-imp-default.mkiv | 4 ++--
tex/context/base/buff-imp-escaped.lua | 4 ++--
tex/context/base/buff-imp-escaped.mkiv | 4 ++--
tex/context/base/buff-imp-lua.lua | 4 ++--
tex/context/base/buff-imp-lua.mkiv | 4 ++--
tex/context/base/buff-imp-mp.lua | 4 ++--
tex/context/base/buff-imp-mp.mkiv | 4 ++--
tex/context/base/buff-imp-nested.lua | 4 ++--
tex/context/base/buff-imp-nested.mkiv | 4 ++--
tex/context/base/buff-imp-parsed-xml.lua | 4 ++--
tex/context/base/buff-imp-parsed-xml.mkiv | 4 ++--
tex/context/base/buff-imp-tex.lua | 2 +-
tex/context/base/buff-imp-tex.mkiv | 4 ++--
tex/context/base/buff-imp-xml.lua | 2 +-
tex/context/base/buff-imp-xml.mkiv | 4 ++--
tex/context/base/buff-ver.mkiv | 4 ++++
tex/context/base/cont-new.mkii | 2 +-
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context.mkii | 2 +-
tex/context/base/context.mkiv | 17 +++++++----------
tex/context/base/type-ini.mkiv | 23 ++++++++++++++++++-----
tex/context/base/type-set.mkiv | 12 ++++++------
tex/generic/context/luatex-fonts-merged.lua | 2 +-
24 files changed, 69 insertions(+), 55 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/buff-imp-default.lua b/tex/context/base/buff-imp-default.lua
index 2e3707442..72a49d625 100644
--- a/tex/context/base/buff-imp-default.lua
+++ b/tex/context/base/buff-imp-default.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-default'] = {
+if not modules then modules = { } end modules ['buff-imp-default'] = {
version = 1.001,
- comment = "companion to v-default.mkiv",
+ comment = "companion to buff-imp-default.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-default.mkiv b/tex/context/base/buff-imp-default.mkiv
index f9a821f0f..7a935e218 100644
--- a/tex/context/base/buff-imp-default.mkiv
+++ b/tex/context/base/buff-imp-default.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-default,
+%D [ file=buff-imp-default,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=Default,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-default.lua}{1.001}
+\registerctxluafile{buff-imp-default.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-escaped.lua b/tex/context/base/buff-imp-escaped.lua
index 060f48ea3..159921e2a 100644
--- a/tex/context/base/buff-imp-escaped.lua
+++ b/tex/context/base/buff-imp-escaped.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-escaped'] = {
+if not modules then modules = { } end modules ['buff-imp-escaped'] = {
version = 1.001,
- comment = "companion to v-escaped.mkiv",
+ comment = "companion to buff-imp-escaped.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-escaped.mkiv b/tex/context/base/buff-imp-escaped.mkiv
index 780d0b518..55d2fb093 100644
--- a/tex/context/base/buff-imp-escaped.mkiv
+++ b/tex/context/base/buff-imp-escaped.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-escaped,
+%D [ file=buff-imp-escaped,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=Escaped,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-escaped.lua}{1.001}
+\registerctxluafile{buff-imp-escaped.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-lua.lua b/tex/context/base/buff-imp-lua.lua
index abe8de211..3a3bb3d2c 100644
--- a/tex/context/base/buff-imp-lua.lua
+++ b/tex/context/base/buff-imp-lua.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-lua'] = {
+if not modules then modules = { } end modules ['buff-imp-lua'] = {
version = 1.001,
- comment = "companion to v-lua.mkiv",
+ comment = "companion to buff-imp-lua.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-lua.mkiv b/tex/context/base/buff-imp-lua.mkiv
index 4ed04f169..a04e23851 100644
--- a/tex/context/base/buff-imp-lua.mkiv
+++ b/tex/context/base/buff-imp-lua.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-lua,
+%D [ file=buff-imp-lua,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=\LUA,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-lua.lua}{1.001}
+\registerctxluafile{buff-imp-lua.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-mp.lua b/tex/context/base/buff-imp-mp.lua
index 7c356a5c8..6b8a26536 100644
--- a/tex/context/base/buff-imp-mp.lua
+++ b/tex/context/base/buff-imp-mp.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-mp'] = {
+if not modules then modules = { } end modules ['buff-imp-mp'] = {
version = 1.001,
- comment = "companion to v-mp.mkiv",
+ comment = "companion to buff-imp-mp.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-mp.mkiv b/tex/context/base/buff-imp-mp.mkiv
index 30eb23f8b..55e13b12d 100644
--- a/tex/context/base/buff-imp-mp.mkiv
+++ b/tex/context/base/buff-imp-mp.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-mp,
+%D [ file=buff-imp-mp,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=\METAPOST,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-mp.lua}{1.001}
+\registerctxluafile{buff-imp-mp.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-nested.lua b/tex/context/base/buff-imp-nested.lua
index e37e1bb58..019cd996d 100644
--- a/tex/context/base/buff-imp-nested.lua
+++ b/tex/context/base/buff-imp-nested.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-nested'] = {
+if not modules then modules = { } end modules ['buff-imp-nested'] = {
version = 1.001,
- comment = "companion to v-nested.mkiv",
+ comment = "companion to buff-imp-nested.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-nested.mkiv b/tex/context/base/buff-imp-nested.mkiv
index e1d582d81..627acc685 100644
--- a/tex/context/base/buff-imp-nested.mkiv
+++ b/tex/context/base/buff-imp-nested.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-nested,
+%D [ file=buff-imp-nested,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=Nested,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-nested.lua}{1.001}
+\registerctxluafile{buff-imp-nested.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-parsed-xml.lua b/tex/context/base/buff-imp-parsed-xml.lua
index 530060b57..22611ac8a 100644
--- a/tex/context/base/buff-imp-parsed-xml.lua
+++ b/tex/context/base/buff-imp-parsed-xml.lua
@@ -1,6 +1,6 @@
-if not modules then modules = { } end modules ['v-parsed-xml'] = {
+if not modules then modules = { } end modules ['buff-imp-parsed-xml'] = {
version = 1.001,
- comment = "companion to v-parsed-xml.mkiv",
+ comment = "companion to buff-imp-parsed-xml.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
copyright = "PRAGMA ADE / ConTeXt Development Team",
license = "see context related readme files"
diff --git a/tex/context/base/buff-imp-parsed-xml.mkiv b/tex/context/base/buff-imp-parsed-xml.mkiv
index b99328be7..1aa8fbc74 100644
--- a/tex/context/base/buff-imp-parsed-xml.mkiv
+++ b/tex/context/base/buff-imp-parsed-xml.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-parsed-xml,
+%D [ file=buff-imp-parsed-xml,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=Parsed \XML,
@@ -13,7 +13,7 @@
% todo: color specific elements
-\registerctxluafile{v-parsed-xml.lua}{1.001}
+\registerctxluafile{buff-imp-parsed-xml.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-tex.lua b/tex/context/base/buff-imp-tex.lua
index 1973017f3..29fd8c0c5 100644
--- a/tex/context/base/buff-imp-tex.lua
+++ b/tex/context/base/buff-imp-tex.lua
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['v-tex'] = {
+if not modules then modules = { } end modules ['buff-imp-tex'] = {
version = 1.001,
comment = "companion to v-tex.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
diff --git a/tex/context/base/buff-imp-tex.mkiv b/tex/context/base/buff-imp-tex.mkiv
index 5cd5753bb..384975729 100644
--- a/tex/context/base/buff-imp-tex.mkiv
+++ b/tex/context/base/buff-imp-tex.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-tex,
+%D [ file=buff-imp-tex,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=\TEX,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-tex.lua}{1.001}
+\registerctxluafile{buff-imp-tex.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-imp-xml.lua b/tex/context/base/buff-imp-xml.lua
index bf6945e26..baf290d4c 100644
--- a/tex/context/base/buff-imp-xml.lua
+++ b/tex/context/base/buff-imp-xml.lua
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['v-xml'] = {
+if not modules then modules = { } end modules ['buff-imp-xml'] = {
version = 1.001,
comment = "companion to v-xml.mkiv",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
diff --git a/tex/context/base/buff-imp-xml.mkiv b/tex/context/base/buff-imp-xml.mkiv
index 3cc9244f2..68dc9ed13 100644
--- a/tex/context/base/buff-imp-xml.mkiv
+++ b/tex/context/base/buff-imp-xml.mkiv
@@ -1,5 +1,5 @@
%D \module
-%D [ file=v-xml,
+%D [ file=buff-imp-xml,
%D version=2010.10.19,
%D title=\CONTEXT\ Visualizer Macros,
%D subtitle=\XML,
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\registerctxluafile{v-xml.lua}{1.001}
+\registerctxluafile{buff-imp-xml.lua}{1.001}
\unprotect
diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/buff-ver.mkiv
index ea259c06a..3e571bab1 100644
--- a/tex/context/base/buff-ver.mkiv
+++ b/tex/context/base/buff-ver.mkiv
@@ -835,4 +835,8 @@
\def\doverbatimspace {\obeyedspace}
+\loadmarkfile{buff-imp-default} % preloaded as otherwise spurious spaces inline due to loading
+\loadmarkfile{buff-imp-nested} % preloaded as otherwise spurious spaces inline due to loading
+\loadmarkfile{buff-imp-escaped} % for completeness
+
\protect \endinput
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 3e7c555e3..6a0b1b2c1 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.01.24 23:51}
+\newcontextversion{2011.01.25 10:40}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 4d19378a0..2bac5c141 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.01.24 23:51}
+\newcontextversion{2011.01.25 10:40}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index b45b5e22e..153cb77aa 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.01.24 23:51}
+\edef\contextversion{2011.01.25 10:40}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 040247a97..285e4a98b 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.01.24 23:51}
+\edef\contextversion{2011.01.25 10:40}
%D For those who want to use this:
@@ -243,16 +243,13 @@
\loadmarkfile{buff-ver}
\loadmarkfile{buff-par}
-\loadmarkfile{v-default} % preloaded as otherwise spurious spaces inline due to loading
-\loadmarkfile{v-nested} % preloaded as otherwise spurious spaces inline due to loading
-\loadmarkfile{v-escaped} % for completeness
-\loadmarkfile{v-tex} % optional as also runtime if not loaded
-\loadmarkfile{v-mp} % optional as also runtime if not loaded
-\loadmarkfile{v-lua} % optional as also runtime if not loaded
-\loadmarkfile{v-xml} % optional as also runtime if not loaded
+\loadmarkfile{buff-imp-tex} % optional as also runtime if not loaded
+\loadmarkfile{buff-imp-mp} % optional as also runtime if not loaded
+\loadmarkfile{buff-imp-lua} % optional as also runtime if not loaded
+\loadmarkfile{buff-imp-xml} % optional as also runtime if not loaded
-\loadmarkfile{v-parsed-xml} % optional
-%loadmarkfile{v-parsed-lua} % optional
+\loadmarkfile{buff-imp-parsed-xml} % optional
+%loadmarkfile{buff-imp-parsed-lua} % optional
\loadmarkfile{strc-blk}
diff --git a/tex/context/base/type-ini.mkiv b/tex/context/base/type-ini.mkiv
index 64db2c698..fce3cd816 100644
--- a/tex/context/base/type-ini.mkiv
+++ b/tex/context/base/type-ini.mkiv
@@ -169,8 +169,17 @@
\egroup
\expandafter\let\csname\??ts:\c!file:\currenttypefile\endcsname\loadedtypescripts}
+% \def\doprocesstypescriptfile
+% {\ctxlua{commands.doprocesstypescriptfile("\currenttypefile")}}
+
\def\doprocesstypescriptfile
- {\ctxlua{commands.doprocesstypescriptfile("\currenttypefile")}}
+ {\startreadingfile
+ \pushendofline
+ \unprotect
+ \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}%
+ \protect
+ \popendofline
+ \stopreadingfile}
\def\usetypescriptonce
{\dotripleempty\dousetypescriptonce}
@@ -472,10 +481,14 @@
\fi \fi \fi
\ifmmode\mr\else\tf\fi} % needed ?
-\def\usetypefile[#1]% recurses on path ! % no storage? obsolete?
- %{\edef\currenttypefile{\f!typeprefix#1}%
- {\edef\currenttypefile{#1}%
- \ctxlua{commands.doprocesstypescriptfile("\currenttypefile")}}
+% \def\usetypefile[#1]% recurses on path ! % no storage? obsolete?
+% %{\edef\currenttypefile{\f!typeprefix#1}%
+% {\edef\currenttypefile{#1}%
+% \ctxlua{commands.doprocesstypescriptfile("\currenttypefile")}}
+
+\def\usetypefile[#1]% recurses on path !
+ {\edef\currenttypefile{\f!typeprefix#1}%
+ \readfile{\currenttypefile.\mksuffix}\donothing{\readfile\currenttypefile\donothing\donothing}}
%D For Taco:
%D
diff --git a/tex/context/base/type-set.mkiv b/tex/context/base/type-set.mkiv
index 89dd68a8f..b25fe5ad9 100644
--- a/tex/context/base/type-set.mkiv
+++ b/tex/context/base/type-set.mkiv
@@ -67,11 +67,11 @@
%definefontsynonym [SansCaps] [SansBold]
\stopsetups
-%usetypescriptfile[def] % preloaded in main context.mkiv file
-%usetypescriptfile[lua] % preloaded in main context.mkiv file
-%usetypescriptfile[tmf] % replaced by otf (mkiv) en one (mkii)
-\usetypescriptfile[siz]
-\usetypescriptfile[otf]
-\usetypescriptfile[loc]
+%usetypescriptfile[type-def] % preloaded in main context.mkiv file
+%usetypescriptfile[type-lua] % preloaded in main context.mkiv file
+%usetypescriptfile[type-tmf] % replaced by otf (mkiv) en one (mkii)
+\usetypescriptfile[type-siz]
+\usetypescriptfile[type-otf]
+\usetypescriptfile[type-loc]
\protect \endinput
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index cb61067af..7d33e2d05 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 01/24/11 23:51:55
+-- merge date : 01/25/11 10:40:58
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3