summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-01-05 19:27:25 +0100
committerHans Hagen <pragma@wxs.nl>2012-01-05 19:27:25 +0100
commit0f4effef16994f1bf24b66ce3ad519930fc3f60e (patch)
tree58ddaaca9286244d9786f6f6632368745dfcfcd3
parent8faafb7250a84be6f1d96be67cbbe27d500d3b47 (diff)
downloadcontext-0f4effef16994f1bf24b66ce3ad519930fc3f60e.tar.gz
beta 2011.11.14 09:19
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4118 -> 4114 bytes
-rw-r--r--tex/context/base/context-version.pngbin106240 -> 105939 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/file-job.mkvi95
-rw-r--r--tex/context/base/status-files.pdfbin24150 -> 24141 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin168961 -> 168962 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 57 insertions, 48 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index fdf1f849c..566cae1f7 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.11.12 12:34}
+\newcontextversion{2011.11.14 09:19}
%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 eb9b9b681..604a5ef3a 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.11.12 12:34}
+\newcontextversion{2011.11.14 09:19}
%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-version.pdf b/tex/context/base/context-version.pdf
index e628eca52..802c3ea9a 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 0fc57d8f7..727bfaf25 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 013e99747..9610d96ef 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.11.12 12:34}
+\edef\contextversion{2011.11.14 09:19}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 6d07af3f8..e636dfa15 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.11.12 12:34}
+\edef\contextversion{2011.11.14 09:19}
%D For those who want to use this:
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/file-job.mkvi
index 8e6f1c41e..a1a44608b 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/file-job.mkvi
@@ -21,52 +21,61 @@
% processing
-\def\doifinputfileelse#name{\ctxcommand{doifinputfileelse("#name")}}
-\def\processfile #name{\ctxcommand{processfile("#name")}}
+\unexpanded\def\doifinputfileelse#name%
+ {\ctxcommand{doifinputfileelse("#name")}}
+
+\unexpanded\def\processfile#name%
+ {\ctxcommand{processfile("#name")}}
% path control
-\def\usepath [#path]{\ctxcommand{usepath("#path")}}
-\def\usesubpath [#path]{\ctxcommand{usesubpath("#path")}}
-\def\allinputpaths {\ctxcommand{allinputpaths()}}
+\unexpanded\def\usepath[#path]%
+ {\ctxcommand{usepath("#path")}}
+
+\unexpanded\def\usesubpath[#path]%
+ {\ctxcommand{usesubpath("#path")}}
+
+\def\allinputpaths
+ {\ctxcommand{allinputpaths()}}
% helper (not really needed nowadays)
\let\locatedfilepath\empty
-\def\locatefilepath#name{\edef\locatedfilepath{\ctxcommand{locatefilepath("#name")}}}
+\unexpanded\def\locatefilepath#name% no [] ?
+ {\edef\locatedfilepath{\ctxcommand{locatefilepath("#name")}}}
% zip files are tree'd
-\def\usezipfile {\dodoubleempty\dousezipfile}
-\def\dousezipfile[#zipname][#subtree]{\ctxcommand{usezipfile("#zipname","#subtree")}}
+\unexpanded\def\usezipfile
+ {\dodoubleempty\use_zip_file}
+
+\def\use_zip_file[#zipname][#subtree]%
+ {\ctxcommand{usezipfile("#zipname","#subtree")}}
% exa stuff might become obsolete:
-\def\loadexamodes {\dosingleempty\doloadexamodes}
-\def\doloadexamodes[#name]{\ctxcommand{loadexamodes("#name")}}
+\unexpanded\def\loadexamodes
+ {\dosingleempty\load_exa_modes}
+
+\def\load_exa_modes[#name]%
+ {\ctxcommand{loadexamodes("#name")}}
% runtime files (maybe also do this in lua?)
% \def\doloadsystemfile#1% only mkiv files
% {\readfile{sys:///#1.\mksuffix}{\showmessage\m!system2{#1.\mksuffix}}\donothing}
-\def\doloadsystemfile#name% only mkiv files
- {\readsysfile{#name.\mksuffix}{\showmessage\m!system2{#name.\mksuffix}}\donothing}
-
-\def\loadsystemfiles
- {\doloadsystemfile\f!newfilename % new code, to be integrated at some point, plus fixes posted on the list
- \doloadsystemfile\f!locfilename % new code, somewhat experimental, not distributed (outside the dev group)
- \doloadsystemfile\f!expfilename % new code, very experimental, can be engine specific, mostly for me only
- \doloadsystemfile\f!sysfilename} % local settings, but probably not that good an idea to use
+\unexpanded\def\loadsystemfiles
+ {\load_system_file\f!newfilename % new code, to be integrated at some point, plus fixes posted on the list
+ \load_system_file\f!locfilename % new code, somewhat experimental, not distributed (outside the dev group)
+ \load_system_file\f!expfilename % new code, very experimental, can be engine specific, mostly for me only
+ \load_system_file\f!sysfilename} % local settings, but probably not that good an idea to use
-% \def\loadoptionfile
-% {\readfile{job:///\jobname.\f!optionextension}
-% {\writestatus\m!system{\jobname.\f!optionextension\space loaded}%
-% \ctxcommand{logoptionfile("\jobname.\f!optionextension")}}%
-% {\writestatus\m!system{no \jobname.\f!optionextension}}}
+\def\load_system_file#name% only mkiv files
+ {\readsysfile{#name.\mksuffix}{\showmessage\m!system2{#name.\mksuffix}}\donothing}
-\def\loadoptionfile
+\unexpanded\def\loadoptionfile
{\readjobfile{\jobname.\f!optionextension}
{\writestatus\m!system{\jobname.\f!optionextension\space loaded}%
\ctxcommand{copyfiletolog("\jobname.\f!optionextension")}}%
@@ -103,34 +112,34 @@
% protect structure
-\unexpanded\def\processfilemany #name{\ctxcommand{processfilemany("#name")}}
-\unexpanded\def\processfileonce #name{\ctxcommand{processfileonce("#name")}}
-\unexpanded\def\processfilenone #name{\ctxcommand{processfilenone("#name")}}
+\unexpanded\def\processfilemany #name{\ctxcommand{processfilemany("#name")}}
+\unexpanded\def\processfileonce #name{\ctxcommand{processfileonce("#name")}}
+\unexpanded\def\processfilenone #name{\ctxcommand{processfilenone("#name")}}
-\unexpanded\def\project {\doifnextoptionalelse\useproject \do_project}
-\unexpanded\def\product {\doifnextoptionalelse\useproduct \do_product}
-\unexpanded\def\component {\doifnextoptionalelse\usecomponent \do_component}
-\unexpanded\def\environment {\doifnextoptionalelse\useenvironment\do_environment}
+\unexpanded\def\project {\doifnextoptionalelse\useproject \do_project}
+\unexpanded\def\product {\doifnextoptionalelse\useproduct \do_product}
+\unexpanded\def\component {\doifnextoptionalelse\usecomponent \do_component}
+\unexpanded\def\environment {\doifnextoptionalelse\useenvironment\do_environment}
-\def\do_project #name {\ctxcommand{useproject ("#name")}}
-\def\do_product #name {\ctxcommand{useproduct ("#name")}}
-\def\do_component #name {\ctxcommand{usecomponent ("#name")}}
-\def\do_environment #name {\ctxcommand{useenvironment("#name")}}
+\def\do_project #name {\ctxcommand{useproject ("#name")}}
+\def\do_product #name {\ctxcommand{useproduct ("#name")}}
+\def\do_component #name {\ctxcommand{usecomponent ("#name")}}
+\def\do_environment #name {\ctxcommand{useenvironment("#name")}}
-\unexpanded\def\startproject {\doifnextoptionalelse\do_startproject \redo_startproject}
-\unexpanded\def\startproduct {\doifnextoptionalelse\do_startproduct \redo_startproduct}
-\unexpanded\def\startcomponent {\doifnextoptionalelse\do_startcomponent \redo_startcomponent}
-\unexpanded\def\startenvironment {\doifnextoptionalelse\do_startenvironment\redo_startenvironment}
+\unexpanded\def\startproject {\doifnextoptionalelse\do_startproject \redo_startproject}
+\unexpanded\def\startproduct {\doifnextoptionalelse\do_startproduct \redo_startproduct}
+\unexpanded\def\startcomponent {\doifnextoptionalelse\do_startcomponent \redo_startcomponent}
+\unexpanded\def\startenvironment {\doifnextoptionalelse\do_startenvironment\redo_startenvironment}
\def\redo_startproject #name {\ctxcommand{startproject ("#name")}}
\def\redo_startproduct #name {\ctxcommand{startproduct ("#name")}}
\def\redo_startcomponent #name {\ctxcommand{startcomponent ("#name")}}
\def\redo_startenvironment #name {\ctxcommand{startenvironment("#name")}}
-\unexpanded\def\useproject [#name]{\do_project {#name}}
-\unexpanded\def\useproduct [#name]{\do_product {#name}}
-\unexpanded\def\usecomponent [#name]{\do_component {#name}}
-\unexpanded\def\useenvironment [#name]{\do_environment{#name}}
+\unexpanded\def\useproject [#name]{\ctxcommand{useproject ("#name")}}
+\unexpanded\def\useproduct [#name]{\ctxcommand{useproduct ("#name")}}
+\unexpanded\def\usecomponent [#name]{\ctxcommand{usecomponent ("#name")}}
+\unexpanded\def\useenvironment [#name]{\ctxcommand{useenvironment("#name")}}
\unexpanded\def\do_startproject [#name]{\ctxcommand{startproject ("#name")}}
\unexpanded\def\do_startproduct [#name]{\ctxcommand{startproduct ("#name")}}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d24a42400..a2a2bc19b 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 307c92c4f..af6a60d9a 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8a951089c..b55a7ba4d 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 11/13/11 23:53:45
+-- merge date : 11/14/11 09:19:24
do -- begin closure to overcome local limits and interference