From e1bf359128771691941392be0be499985e249370 Mon Sep 17 00:00:00 2001 From: Marius Date: Mon, 3 Oct 2011 00:00:13 +0300 Subject: beta 2011.10.02 22:44 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4096 -> 4096 bytes tex/context/base/context-version.png | Bin 105109 -> 105446 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/page-lin.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 23919 -> 23911 bytes tex/context/base/status-lua.pdf | Bin 162871 -> 162867 bytes tex/context/base/strc-ref.mkvi | 14 +++---- tex/context/base/supp-box.mkiv | 45 +++++++++++++++++++++ tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 58 insertions(+), 13 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index d5242bf5b..d24e2d4f8 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.10.02 14:35} +\newcontextversion{2011.10.02 22:44} %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 0a6b3eec2..bd35fb34c 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.10.02 14:35} +\newcontextversion{2011.10.02 22:44} %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 144307f33..49e28803e 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-version.png b/tex/context/base/context-version.png index 3ccefb0c0..c8dd0f4af 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 624d447e6..53ec5343b 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.10.02 14:35} +\edef\contextversion{2011.10.02 22:44} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e92d9dcac..265181292 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.10.02 14:35} +\edef\contextversion{2011.10.02 22:44} %D For those who want to use this: diff --git a/tex/context/base/page-lin.mkiv b/tex/context/base/page-lin.mkiv index a643d670a..5ba859fa8 100644 --- a/tex/context/base/page-lin.mkiv +++ b/tex/context/base/page-lin.mkiv @@ -129,7 +129,7 @@ \attribute\linereferenceattribute\linerefcounter #3% % for the moment we use a simple system i.e. no prefixes etc .. todo: store as number - \expanded{\dodosetreference{line}{#2}{conversion=\linenumberparameter\c!conversion}{\the\linerefcounter}}% kind labels userdata text + \expanded{\set_named_reference{line}{#2}{conversion=\linenumberparameter\c!conversion}{\the\linerefcounter}}% kind labels userdata text \endgroup} \def\mkstartlinereference#1{\mksomelinereference{#1}{lr:b:#1}{}\ignorespaces} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index be86d48a0..a7bd6be68 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 da69c5567..f5e43d693 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index 40f03a6d6..b7159dfbc 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -101,10 +101,10 @@ %D These are implemented in a low level form as: -\def\do_text_reference [#labels]{\do_do_set_reference\s!text{#labels}{}} -\def\do_page_reference [#labels]{\do_do_set_reference\s!page{#labels}{}{}} -\def\do_full_reference [#labels]{\do_do_set_reference\s!full{#labels}{}} -\def\do_set_reference[#labels][#settings]{\do_do_set_reference\s!user{#labels}{#settings}{}} +\def\do_text_reference [#labels]{\set_named_reference\s!text{#labels}{}} +\def\do_page_reference [#labels]{\set_named_reference\s!page{#labels}{}{}} +\def\do_full_reference [#labels]{\set_named_reference\s!full{#labels}{}} +\def\do_set_reference[#labels][#settings]{\set_named_reference\s!user{#labels}{#settings}{}} %D Actually there is not much difference between a text and a %D full reference, but it's the concept that counts. The low @@ -121,14 +121,14 @@ \def\dofinishsomereference#kind{\executeifdefined{dofinish#{kind}reference}\gobbletwoarguments} -\def\do_do_set_reference +\def\set_named_reference {\ifreferencing - \expandafter\do_do_do_set_reference + \expandafter\set_named_reference_indeed \else \expandafter\gobblefourarguments \fi} -\def\do_do_do_set_reference#kind#labels#userdata#text% labels userdata text -> todo: userdata +\def\set_named_reference_indeed#kind#labels#userdata#text% labels userdata text -> todo: userdata {\ifreferencing % we could have a more efficient one for page references but for the moment % we don't care too much diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/supp-box.mkiv index ff15d29f9..caded9e1f 100644 --- a/tex/context/base/supp-box.mkiv +++ b/tex/context/base/supp-box.mkiv @@ -2501,3 +2501,48 @@ \ruledvbox to \strutheight{\hbox{\strut gans}} \ruledvbox to \strutheight{\vss\hbox{gans}} \egroup + +% to be considered + +% \startluacode +% +% local spacer = lpeg.patterns.spacer +% +% function commands.withwords(command,str) +% if str then +% command = command or "ruledhbox" +% local done = false +% local function apply(s) +% if done then +% context.space() +% done = true +% else +% context.dontleavehmode() +% end +% context[command](s) +% end +% lpeg.match(lpeg.splitter(spacer,apply),str) +% end +% +% end +% +% \stopluacode +% +% \unprotect +% +% \unexpanded\def\withwordsinstring#1#2% command str +% {\ctxcommand{withwords(\!!bs#1\!!es,\!!bs#2\!!es)}} +% +% \unexpanded\def\withwordsinfile#1#2% command name +% {\ctxcommand{withwords(\!!bs#1\!!es,io.loaddata(resolvers.findfile("#2")))}} +% +% \protect +% +% \starttext +% +% \defineframed[colored][foregroundcolor=red,foregroundstyle=\bfc\underbar,location=low] +% +% \withwordsinstring{colored}{bla bla} +% \withwordsinfile{colored}{ward.tex} +% +% \stoptext diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 5544161de..ba34077c9 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 : 10/02/11 14:35:52 +-- merge date : 10/02/11 22:44:18 do -- begin closure to overcome local limits and interference -- cgit v1.2.3