From 234346c192ce664937886d44ccca629a7093acf0 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 4 Jun 2013 20:27:00 +0200 Subject: beta 2013.06.04 20:27 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4130 -> 4126 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/scrp-ini.mkiv | 95 +++++++++++++++++++++ tex/context/base/status-files.pdf | Bin 24644 -> 24662 bytes tex/context/base/status-lua.pdf | Bin 212163 -> 212084 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 tex/context/base/scrp-ini.mkiv diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index ab6ac327b..fd400605a 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{2013.06.04 19:42} +\newcontextversion{2013.06.04 20:27} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 0711ba100..60cf247f9 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 63faee3ab..4e614882e 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.06.04 19:42} +\edef\contextversion{2013.06.04 20:27} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/scrp-ini.mkiv b/tex/context/base/scrp-ini.mkiv new file mode 100644 index 000000000..4a27dd8e2 --- /dev/null +++ b/tex/context/base/scrp-ini.mkiv @@ -0,0 +1,95 @@ +%D \module +%D [ file=scrp-ini, +%D version=2009.02.06, +%D title=\CONTEXT\ Script Macros, +%D subtitle=Initialization, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% here we collect code from other places (was organized differently) + +\registerctxluafile{scrp-ini}{1.001} +\registerctxluafile{scrp-cjk}{1.001} +\registerctxluafile{scrp-eth}{1.001} +\registerctxluafile{scrp-tha}{1.001} + +\definesystemattribute[scriptinjection][public] +\definesystemattribute[scriptsplitting][public] +\definesystemattribute[scriptstatus] [public] + +%D Since scripts need specific \LUA\ code we use hard coded attribute +%D values, but we might have more tricks at some time, so we use a +%D proper define macro too. + +\unprotect + +\installcorenamespace{script} + +\installcommandhandler \??script {script} \??script + +\let\setupscripts\setupscript % be nice + +% presets are global and are currently defined in lua + +\appendtoks + \setuevalue\currentscript{\setscript[\currentscript]}% +\to \everydefinescript + +\unexpanded\def\scripts_basics_set + {\ctxlua{scripts.set("\currentscript","\scriptparameter\c!method","\scriptparameter\c!preset")}} + +\unexpanded\def\setscript[#1]% + {\edef\currentscript{#1}% + \scripts_basics_set} + +\unexpanded\def\resetscript + {\ctxlua{scripts.reset()}} + +\unexpanded\def\startscript[#1]% + {\begingroup + \edef\currentscript{#1}% + \scripts_basics_set} + +\unexpanded\def\stopscript + {\endgroup} + +% % todo: +% +% \unexpanded\def\setscriptsplitterlist +% {\dodoubleargument\scripts_basics_set_splitter_list} +% +% \def\scripts_basics_set_splitter_list[#1][#2]% +% {\ctxcommand{setscriptsplitterlist("#1","#2")} + +% \setscript[hangul] \hangul \startscript[hangul] + +\definescript [hangul] [\c!method=hangul] +\definescript [hanzi] [\c!method=hanzi] +\definescript [nihongo] [\c!method=nihongo] +\definescript [ethiopic] [\c!method=ethiopic] +\definescript [thai] [\c!method=thai] + +\definescript [latin] [\c!method=] % resets the attribute (also currentscript) + +\definescript [test] [\c!method=test] + +% a new trick (at some point we will predefine more scripts and consider a link with the above) + +\appendtoks + \ifx\currentscript\empty + \doifelse{\scriptparameter\s!features}\v!auto\enableautofontscript\disableautofontscript + \fi +\to \everysetupscript + +\unexpanded\def\enableautofontscript {\ctxcommand{enableautofontscript ()}} +\unexpanded\def\disableautofontscript{\ctxcommand{disableautofontscript()}} + +\definefontfeature[latn][script=latn] +\definefontfeature[grek][script=grek] + +\protect \endinput diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 124f648e8..6f130e506 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index fd994d224..f45bf9b08 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 929f38c47..183a32d39 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 : 06/04/13 19:42:30 +-- merge date : 06/04/13 20:27:13 do -- begin closure to overcome local limits and interference -- cgit v1.2.3